三单派单时改派Bug

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPmqManagementDistributionDao.java

@@ -43,5 +43,6 @@ public interface ZhcxPmqManagementDistributionDao extends BaseMapper<ZhcxPmqMana
 
     List<ZhcxPmqManageChildVo> getAllDeptByPid(@Param("id") String id);
 
+    // 第三层
     List<MachineState> getMachinesStatus(@Param("projectId")String projectId,@Param("id") String id);
 }

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

@@ -111,7 +111,8 @@
                     t.MACHINENO,
                     CASE
                         WHEN SUM(CASE WHEN t.STATUS = '已关闭' THEN 1 ELSE 0 END) = COUNT(*) THEN '已关闭'
-                        WHEN SUM(CASE WHEN t.STATUS = '已关闭' AND t.STATUS != '未关闭'  THEN 1 ELSE 0 END) > 0 THEN '已关闭'
+                        WHEN SUM(CASE WHEN t.STATUS = '未关闭' THEN 1 ELSE 0 END) >0 THEN '未关闭'
+                        WHEN (SUM(CASE WHEN t.STATUS = '已关闭' THEN 1 ELSE 0 END) > 0 AND SUM(CASE WHEN t.STATUS!= '已关闭' THEN 1 ELSE 0 END) = COUNT(*) - SUM(CASE WHEN t.STATUS = '已关闭' THEN 1 ELSE 0 END)) THEN '已关闭'
                         WHEN SUM(CASE WHEN t.STATUS = 'NA' THEN 1 ELSE 0 END) = COUNT(*) THEN 'NA'
                         ELSE THEN '未关闭'
                         END AS STATUS