[task-6690] 设备已停用和废弃的不在推送设备检定校准

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/EquipmentMaintenancePlanJob.java

@@ -400,10 +400,21 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
         // insertRecordsFromTemplate("sbjdjzjl");
 
         // 2025-04-10 修改  不再新增校准记录，用计划记录开流程
-        String sql = "UPDATE t_mjsbjdxzjhzb a JOIN t_mjsbjdxzjh b ON a.parent_id_ = b.id_ SET a.marks_ = 'record' " +
+      /*  String sql = "UPDATE t_mjsbjdxzjhzb a JOIN t_mjsbjdxzjh b ON a.parent_id_ = b.id_ SET a.marks_ = 'record' " +
                 "WHERE b.shi_fou_guo_shen_ = '已完成' and a.ji_hua_ri_qi_<>'' and a.ji_hua_ri_qi_ is not null " +
                 "AND a.ji_hua_ri_qi_ <= DATE_ADD(CURDATE(), INTERVAL 30 DAY) AND a.ji_hua_ri_qi_>= CURRENT_DATE AND a.shi_fou_guo_shen_='待处理' " +
-                "AND (a.dsrw_ is null or a.dsrw_ ='') ";
+                "AND (a.dsrw_ is null or a.dsrw_ ='') ";*/
+        String sql = "UPDATE t_mjsbjdxzjhzb a " +
+                "JOIN t_mjsbjdxzjh b ON a.parent_id_ = b.id_ " +
+                "JOIN t_sbdj d ON a.she_bei_bian_hao_ = d.id_ " +
+                "SET a.marks_ = 'record' " +
+                "WHERE b.shi_fou_guo_shen_ = '已完成' " +
+                "  AND a.ji_hua_ri_qi_ <> '' AND a.ji_hua_ri_qi_ IS NOT NULL " +
+                "  AND a.ji_hua_ri_qi_ <= DATE_ADD(CURDATE(), INTERVAL 30 DAY) " +
+                "  AND a.ji_hua_ri_qi_ >= CURRENT_DATE " +
+                "  AND a.shi_fou_guo_shen_ = '待处理' " +
+                "  AND (a.dsrw_ IS NULL OR a.dsrw_ = '') " +
+                "  AND d.she_bei_zhuang_ta NOT IN ('停用', '报废')";
         commonDao.execute(sql);
 
         // 检定/校准计划与实施记录表_子表
@@ -582,10 +593,22 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
 
 
     protected void startWorkflow(String tableName, String formKey, String defKey) {
-        String fetchSql = "SELECT a.id_ id_ FROM t_mjsbjdxzjhzb a inner join t_mjsbjdxzjh b on a.parent_id_=b.id_ " +
+      /*  String fetchSql = "SELECT a.id_ id_ FROM t_mjsbjdxzjhzb a inner join t_mjsbjdxzjh b on a.parent_id_=b.id_ " +
                 "where b.shi_fou_guo_shen_='已完成' and a.marks_ = 'record' and a.ji_hua_ri_qi_<>'' and a.ji_hua_ri_qi_ is not null " +
                 " and a.ji_hua_ri_qi_<=DATE_ADD(CURDATE(),INTERVAL 30 DAY) and a.ji_hua_ri_qi_>=CURRENT_DATE and a.shi_fou_guo_shen_='待处理' " +
-                " AND (a.dsrw_ is null or a.dsrw_ ='') ";
+                " AND (a.dsrw_ is null or a.dsrw_ ='') ";*/
+        String fetchSql = "SELECT a.id_ id_ " +
+                "FROM t_mjsbjdxzjhzb a " +
+                "INNER JOIN t_mjsbjdxzjh b ON a.parent_id_ = b.id_ " +
+                "INNER JOIN t_sbdj d ON a.she_bei_bian_hao_ = d.id_ " +
+                "WHERE b.shi_fou_guo_shen_ = '已完成' " +
+                "  AND a.marks_ = 'record' " +
+                "  AND a.ji_hua_ri_qi_ <> '' AND a.ji_hua_ri_qi_ IS NOT NULL " +
+                "  AND a.ji_hua_ri_qi_ <= DATE_ADD(CURDATE(), INTERVAL 30 DAY) " +
+                "  AND a.ji_hua_ri_qi_ >= CURRENT_DATE " +
+                "  AND a.shi_fou_guo_shen_ = '待处理' " +
+                "  AND (a.dsrw_ IS NULL OR a.dsrw_ = '') " +
+                "  AND d.she_bei_zhuang_ta NOT IN ('停用', '报废')";
         fetchSql = String.format(fetchSql,tableName);
         List<Map<String, Object>> list = (List<Map<String, Object>>) commonDao.query(fetchSql);
         if (BeanUtils.isEmpty(list)) return;