Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/entity/CmmsInspectVo.java

@@ -34,4 +34,7 @@ public class CmmsInspectVo extends CmmsInspect {
     private String type;
     /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
     private List<CmmsInspectPlanTaskVo> children;
+
+    /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
+    private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/impl/CmmsInspectServiceImpl.java

@@ -5,7 +5,9 @@ import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo;
 import org.jeecg.modules.cmmsInspect.mapper.CmmsInspectMapper;
 import org.jeecg.modules.cmmsInspect.service.ICmmsInspectService;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
 import org.jeecg.modules.cmmsInspectLine.service.ICmmsInspectLineService;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
 import org.jeecg.modules.cmmsInspectPlan.convert.CmmsInspectPlanConvert;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
@@ -91,6 +93,21 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
         // 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
         CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanTreeById(cmmInspect.getInspectplanid(),id);
 
+        List<CmmsInspectPlanTaskVo> childrenList = cmmsInspectPlanById.getChildren();
+        boolean flag = true;
+        for (CmmsInspectPlanTaskVo child : childrenList) {
+            // 如果有任何一个 巡检路线或巡检点不为1 则巡检工单状态为0
+            if ("0".equals(child.getCompletionStatus())){
+                flag = false;
+                break;
+            }
+        }
+        if (flag){
+            inspectVo.setCompletionStatus("1");
+        }else {
+            inspectVo.setCompletionStatus("0");
+        }
+
         inspectVo.setTitle(cmmInspect.getInspectname());
         inspectVo.setKey(cmmInspect.getInspectname());
         inspectVo.setType("巡检工单");
@@ -115,14 +132,41 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
                     taskList.get(i).setKey(name);
                     taskList.get(i).setType("巡检点");
                     //taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid));
-                    taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid,inspectid).getChildren());
+                    List<CmmsInspectContentVo> childrenList = inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid, inspectid).getChildren();
+                    boolean flag = true;
+                    for (CmmsInspectContentVo cont:childrenList) {
+                        // 如果巡检内容中 的countStatus有一个不为1 则该巡检点状态为0
+                        if ("0".equals(cont.getCompletionStatus())){
+                            flag = false;
+                            break;
+                        }
+                    }
+                    if (flag){
+                        taskList.get(i).setCompletionStatus("1");
+                    }else {
+                        taskList.get(i).setCompletionStatus("0");
+                    }
+                    taskList.get(i).setChildren(childrenList);
                 }else {
                     String name = inspectLineService.getNameById(taskList.get(i).getRelid());
                     taskList.get(i).setTitle(name);
                     taskList.get(i).setKey(name);
                     taskList.get(i).setType("巡检路线");
                     //taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineTreeByIdA(relid));
-                    taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeByIdA(relid,inspectid).getChildren());
+                    List<CmmsInspectLineDetailVo> childrenList = inspectLineService.getCmmsInspectLineTreeByIdA(relid, inspectid).getChildren();
+                    boolean flag = true;
+                    for (CmmsInspectLineDetailVo vo:childrenList) {
+                        if ("0".equals(vo.getCompletionStatus())){
+                            flag = false;
+                            break;
+                        }
+                    }
+                    if (flag) {
+                        taskList.get(i).setCompletionStatus("1");
+                    }else {
+                        taskList.get(i).setCompletionStatus("0");
+                    }
+                    taskList.get(i).setChildren(childrenList);
                 }
             }
         }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContentVo.java

@@ -35,4 +35,6 @@ public class CmmsInspectContentVo extends CmmsInspectContent{
     private String key;
     /** type 用于前端展示树形结构 */
     private String type;
+    /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
+    private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/impl/CmmsInspectContentServiceImpl.java

@@ -121,6 +121,15 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
         CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
         if (ObjectUtil.isNotNull(cmmsInspectContent)){
             List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItemsById(cmmsInspectContent.getId(),inspectid);
+            // 查询未反馈巡检项的数量
+            int countIstatus = inspectTcontentItemService.getCountIstatus(cmmsInspectContent.getId(), inspectid);
+            if (countIstatus == 0){
+                // 如果未反馈的数量为0 则证明该巡检内容已完成
+                cmmsInspectContent.setCompletionStatus("1");
+            }else {
+                // 如果未反馈的数量不为0 则证明该巡检内容未完成
+                cmmsInspectContent.setCompletionStatus("0");
+            }
             cmmsInspectContent.setInspectTcontentItemList(inspectTcontentItems);
             cmmsInspectContent.setTitle(cmmsInspectContent.getContentname());
             cmmsInspectContent.setKey(cmmsInspectContent.getContentname());

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/entity/CmmsInspectLineVo.java

@@ -28,4 +28,7 @@ public class CmmsInspectLineVo extends CmmsInspectLine{
     /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
     private List<CmmsInspectLineDetailVo> children;
 
+    /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
+    private String completionStatus;
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/impl/CmmsInspectLineServiceImpl.java

@@ -185,13 +185,38 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
                         contentList.add(cmmsInspectContent);
                     }
                 }
+                boolean flag = true;
+                for (CmmsInspectContentVo cont:contentList) {
+                    // 如果巡检内容中 的countStatus有一个不为1 则该巡检点状态为0
+                    if ("0".equals(cont.getCompletionStatus())){
+                        flag = false;
+                        break;
+                    }
+                }
+                if (flag){
+                    list.get(i).setCompletionStatus("1");
+                }else {
+                    list.get(i).setCompletionStatus("0");
+                }
                 list.get(i).setTitle(list.get(i).getContentname());
                 list.get(i).setKey(list.get(i).getContentname());
                 list.get(i).setType("巡检点");
                 list.get(i).setChildren(contentList);
             }
         }
-
+        boolean f = true;
+        for (CmmsInspectLineDetailVo vo : list) {
+            // 如果有任何一个巡检点的状态为0 则证明该巡检路线未完成 为0
+            if ("0".equals(vo.getCompletionStatus())){
+                f = false;
+                break;
+            }
+        }
+        if (f){
+            inspectLineVo.setCompletionStatus("1");
+        }else {
+            inspectLineVo.setCompletionStatus("0");
+        }
         inspectLineVo.setTitle(cmmsInspectLine.getLinename());
         inspectLineVo.setKey(cmmsInspectLine.getLinename());
         inspectLineVo.setType("巡检路线");

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/entity/CmmsInspectLineDetailVo.java

@@ -40,4 +40,6 @@ public class CmmsInspectLineDetailVo extends CmmsInspectLineDetail{
     private String type;
     /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
     private List<CmmsInspectContentVo> children;
+    /** completionStatus 用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
+    private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/entity/CmmsInspectPlanTaskVo.java

@@ -61,4 +61,7 @@ public class CmmsInspectPlanTaskVo<T> extends CmmsInspectPlanTask{
     private String type;
     /** children  用于前端展示树形结构 */
     private List<T> children;
+
+    /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
+    private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpotVo.java

@@ -28,4 +28,6 @@ public class CmmsInspectSpotVo extends CmmsInspectSpot{
     private String type;
     /** children 用于前端展示树形结构 */
     private List<CmmsInspectContentVo> children;
+    /** completionStatus  用于前端展示树形结构是否完成巡检 0未完成 1已完成 */
+    private String completionStatus;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/impl/CmmsInspectSpotServiceImpl.java

@@ -145,6 +145,19 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
             CmmsInspectContentVo cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentTreeByIdA(equipmentid,inspectid);
             contList.add(cmmsInspectContentByIdA);
         }
+        boolean flag = true;
+        for (CmmsInspectContentVo cont:contList) {
+            // 如果巡检内容中 的countStatus有一个不为1 则该巡检点状态为0
+            if ("0".equals(cont.getCompletionStatus())){
+                flag = false;
+                break;
+            }
+        }
+        if (flag){
+            cmmsInspectSpotVo.setCompletionStatus("1");
+        }else {
+            cmmsInspectSpotVo.setCompletionStatus("0");
+        }
         cmmsInspectSpotVo.setTitle(cmmsInspectSport.getContentname());
         cmmsInspectSpotVo.setKey(cmmsInspectSport.getContentname());
         cmmsInspectSpotVo.setType("巡检点");

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/CmmsInspectTcontentItemMapper.java

@@ -23,4 +23,7 @@ public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTco
     CmmsInspect getInspectById(String inspectid);
 
     List<CmmsInspectTcontentItem> getInspectTcontentItemsById(@Param("countid") String countId,@Param("inspectid") String inspectId);
+
+    int getCountIstatus(@Param("id") String id,@Param("inspectid") String inspectid);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/xml/CmmsInspectTcontentItemMapper.xml

@@ -19,4 +19,7 @@
         select * from cmms_inspect_tcontent_item where contitemtid = #{countid} and inspectid = #{inspectid}
     </select>
 
+    <select id="getCountIstatus" resultType="int">
+        select count(*) from cmms_inspect_tcontent_item where contitemtid = #{id} and inspectid = #{inspectid} and istatus = '0'
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/ICmmsInspectTcontentItemService.java

@@ -58,4 +58,12 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
     boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req);
 
     List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 判断 巡检工单下巡检内容下的所有巡检项是否全部完成了反馈
+     *   date: 2024/1/29
+     */
+    int getCountIstatus(String id, String inspectid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/impl/CmmsInspectTcontentItemServiceImpl.java

@@ -130,4 +130,15 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     public List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId) {
         return mapper.getInspectTcontentItemsById(countId, inspectId);
     }
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 判断 巡检工单下巡检内容下的所有巡检项是否全部完成了反馈
+     *   date: 2024/1/29
+     */
+    @Override
+    public int getCountIstatus(String id, String inspectid) {
+        return mapper.getCountIstatus(id, inspectid);
+    }
 }