三单查询逻辑更新

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementDistributionServiceImpl.java

@@ -212,8 +212,16 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
         // 构建第二层数据
         List<ZhcxPmqManageChildVo> childList = baseMapper.getAllDeptByPid(id);
         for (ZhcxPmqManageChildVo zhcxPmqManageChildVo : childList) {
+            String closestatus = zhcxPmqManageChildVo.getClosestatus();
             // 构造第三层数据
             List<MachineState> machines = baseMapper.getMachinesStatus(projectId,zhcxPmqManageChildVo.getId());
+            if (!StringUtils.isEmpty(closestatus)){
+                machines.forEach(item ->{
+                    if(item.getSTATUS().equals("未关闭")){
+                        item.setSTATUS(closestatus);
+                    }
+                });
+            }
             zhcxPmqManageChildVo.setMachines(machines);
         }
         return R.ok(childList);

business-common/src/main/resources/mybatis/business/ZhcxPmqManagementDistributionDao.xml

@@ -111,7 +111,8 @@
             manage.ID AS pid,
             recored.SEQNO AS seqno,
             recored.DEPTID AS deptId,
-            m.PARENTNXDEPTNAME ||'/'||recored.DEPTNAME AS deptName
+            m.PARENTNXDEPTNAME ||'/'||recored.DEPTNAME AS deptName,
+            recored.CLOSESTATUS AS closestatus
         FROM
             INCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED recored
                 LEFT JOIN INCONTROL.ZHCX_PMQ_MANAGEMENT manage ON manage.ID = recored.PMQMID AND manage.DELETED = '0'

business-entity/src/main/java/com/rongwei/bsentity/vo/report/ZhcxPmqManageChildVo.java

@@ -29,6 +29,9 @@ public class ZhcxPmqManageChildVo {
     // 部门名
     private String deptName;
 
+    // 关闭状态
+    private String closestatus;
+
     // 对应机台的状态
     private List<MachineState> machines;
 }