From 99a7d37ed62e5e9151fa0db8e19d2a41a2c2039e Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 8 Dec 2023 17:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E4=BF=9D=E5=85=BB=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=A3=80=E6=9F=A5=E9=A1=B9=E8=8E=B7=E5=8F=96=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EquUpkeepController.java       | 10 +++++
 .../op/device/service/IEquUpkeepService.java  |  2 +
 .../service/impl/EquUpkeepServiceImpl.java    | 38 +++++++++++++++++--
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepController.java
index 3e61a08a..e9a6fa97 100644
--- a/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepController.java
+++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquUpkeepController.java
@@ -46,6 +46,16 @@ public class EquUpkeepController extends BaseController {
         return equUpkeepService.formatEquItem(equPlanEquList);
     }
 
+    /**
+     * 处理计划设备信息（检查项获取全部）
+     * @param equPlanEquList
+     * @return
+     */
+    @PostMapping("/formatEquItemNoCondition")
+    public AjaxResult formatEquItemNoCondition(@RequestBody List<EquPlanEqu> equPlanEquList) {
+        return equUpkeepService.formatEquItemNoCondition(equPlanEquList);
+    }
+
     /**
      * 查询保养计划列表
      */
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquUpkeepService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquUpkeepService.java
index 16cbe296..bc6b8ccf 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/IEquUpkeepService.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquUpkeepService.java
@@ -69,4 +69,6 @@ public interface IEquUpkeepService {
      * @return
      */
     AjaxResult formatEquItem(List<EquPlanEqu> equPlanEquList);
+
+    AjaxResult formatEquItemNoCondition(List<EquPlanEqu> equPlanEquList);
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
index 5c89d49c..62f53359 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
@@ -113,7 +113,13 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
     @Override
     @DS("#header.poolName")
     public AjaxResult formatEquItem(List<EquPlanEqu> equPlanEquList) {
-        return formatEquItemCommon(equPlanEquList, "maintenance", "存在设备未设置保养项！");
+        return formatEquItemCommon(equPlanEquList, "maintenance", "存在设备未设置保养项！",true);
+    }
+
+    @Override
+    @DS("#header.poolName")
+    public AjaxResult formatEquItemNoCondition(List<EquPlanEqu> equPlanEquList) {
+        return formatEquItemCommon(equPlanEquList, "maintenance", "存在设备未设置保养项！",false);
     }
 
     /**
@@ -124,7 +130,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
      * @param message
      * @return
      */
-    private AjaxResult formatEquItemCommon(List<EquPlanEqu> equPlanEquList, String planType, String message) {
+    private AjaxResult formatEquItemCommon(List<EquPlanEqu> equPlanEquList, String planType, String message,Boolean check) {
         for (EquPlanEqu data : equPlanEquList) {
 
             // 检查项名称临时对象
@@ -139,7 +145,33 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
                 // 处理检查项信息
                 for (EquCheckItem checkItem : equCheckItemList) {
                     // 获取循环周期一致的检查项
-                    if (checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType())) {
+                    if (checkItem.getItemLoop() == data.getItemLoop() && checkItem.getItemLoopType().equals(data.getItemLoopType()) && check) {
+                        // 创建检查项返回对象
+                        EquPlanDetail detail = new EquPlanDetail();
+                        BeanUtils.copyProperties(checkItem, detail);
+
+                        if (!detail.getItemCode().isEmpty()) {
+                            // 累加检查项名称（前端信息回显）
+                            itemTempName.append(detail.getItemName()).append(",");
+                            // 通过检查项code获取标准信息列表
+                            List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
+                            // 处理标准信息
+                            if (equCheckItemList.size() > 0) {
+                                // 创建标准列表返回对象
+                                List<EquPlanStandard> standardList = new ArrayList<>();
+                                for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
+                                    // 创建标准返回对象
+                                    EquPlanStandard standard = new EquPlanStandard();
+                                    BeanUtils.copyProperties(standardTemp, standard);
+
+                                    standard.setShowFlag(true);// 设置默认值（用于前端）
+                                    standardList.add(standard);// 返回对象添加到返回列表对象
+                                }
+                                detail.setEquPlanStandardList(standardList);// 标准列表信息置入检查项
+                            }
+                        }
+                        detailList.add(detail);// 返回对象添加到返回列表对象
+                    }else {
                         // 创建检查项返回对象
                         EquPlanDetail detail = new EquPlanDetail();
                         BeanUtils.copyProperties(checkItem, detail);