危险作业处罚人员提醒优化

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -184,7 +184,7 @@ public class SaveConstans {
         /**
          * 危险作业处罚内容
          */
-        public static final String DANGEROUS_CONTENT = "%s:%s-%s,处罚金额：%s，时间：%s";
+        public static final String DANGEROUS_CONTENT = "%s，作业时间：%s至%s，处罚金额：%s，处罚时间：【%s】";
         /**
          * 隐患任务提醒内容
          */

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SafeCheckSendNotifyServiceImpl.java

@@ -125,9 +125,13 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
                 String punishPersonnelId = (String) item.get("PUNISHPERSONNELID");
                 List<String> personnelIdList = new ArrayList<>();
                 personnelIdList.add(punishPersonnelId);
+                String jobType = item.get("JOBTYPE") == null ? "" : item.get("JOBTYPE").toString();
+                String assignmentTimeStart = item.get("ASSIGNMENTTIMESTART") == null ? "" : item.get("ASSIGNMENTTIMESTART").toString();
+                String assignmentTimeEnd = item.get("ASSIGNMENTTIMEEND") == null ? "" : item.get("ASSIGNMENTTIMEEND").toString();
+                String penaltyAmount = item.get("PENALTYAMOUNT") == null ? "" : item.get("PENALTYAMOUNT").toString();
+                String modifyDate = item.get("MODIFYDATE") == null ? "" : item.get("MODIFYDATE").toString();
                 CXCommonUtils.sendNotify(DANGEROUS_TITLE, String.format(DANGEROUS_CONTENT,
-                                item.get("JOBTYPE"), item.get("ASSIGNMENTTIMESTART"), item.get("ASSIGNMENTTIMEEND"),
-                                item.get("PENALTYAMOUNT"), item.get("MODIFYDATE")),
+                                jobType, assignmentTimeStart, assignmentTimeEnd, penaltyAmount, modifyDate),
                         "", personnelIdList, (String) item.get("ID"), DANGEROUS);
             }
         }
@@ -143,9 +147,13 @@ public class SafeCheckSendNotifyServiceImpl implements SafeCheckSendNotifyServic
             String punishPersonnelId = (String) dangerous.get("PUNISHPERSONNELID");
             List<String> personnelIdList = new ArrayList<>();
             personnelIdList.add(punishPersonnelId);
+            String jobType = dangerous.get("JOBTYPE") == null ? "" : dangerous.get("JOBTYPE").toString();
+            String assignmentTimeStart = dangerous.get("ASSIGNMENTTIMESTART") == null ? "" : dangerous.get("ASSIGNMENTTIMESTART").toString();
+            String assignmentTimeEnd = dangerous.get("ASSIGNMENTTIMEEND") == null ? "" : dangerous.get("ASSIGNMENTTIMEEND").toString();
+            String penaltyAmount = dangerous.get("PENALTYAMOUNT") == null ? "" : dangerous.get("PENALTYAMOUNT").toString();
+            String modifyDate = dangerous.get("MODIFYDATE") == null ? "" : dangerous.get("MODIFYDATE").toString();
             CXCommonUtils.sendNotify(DANGEROUS_TITLE, String.format(DANGEROUS_CONTENT,
-                            dangerous.get("JOBTYPE"), dangerous.get("ASSIGNMENTTIMESTART"), dangerous.get("ASSIGNMENTTIMEEND"),
-                            dangerous.get("PENALTYAMOUNT"), dangerous.get("MODIFYDATE")),
+                            jobType, assignmentTimeStart, assignmentTimeEnd, penaltyAmount, modifyDate),
                     "", personnelIdList, (String) dangerous.get("ID"), DANGEROUS);
         }
         return R.ok();