feature 甘特图增加预计来料日期

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

@@ -376,7 +376,7 @@ public class SaveConstans {
         /**
          * 安全附件催办提醒
          */
-        public static final String SAFETY_ATTACHMENT_VERIFICATION_URGING_TITLE = "安全附件检验提醒";
+        public static final String SAFETY_ATTACHMENT_VERIFICATION_URGING_TITLE = "安全附件检验--催办提醒";
         /**
          * 报工不合格提醒
          */

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

@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
 
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.SAFETY_ATTACHMENT_VERIFICATION_URGING_CONTENT;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.SAFETY_ATTACHMENT_VERIFICATION_URGING_TITLE;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.SAFETY_ATTACHMENT_VERIFICATION;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.SPECIALEQUIPMENT;
 
 /**
@@ -68,7 +69,7 @@ public class SecurityAttachmentsUrgingServiceImpl implements UrgingService {
                 String.format(SAFETY_ATTACHMENT_VERIFICATION_URGING_CONTENT, currentUser.getName(), safeAttachmentsDos.size())
                 , userInfo.stream().map(UserMailOrgVo::getId).collect(Collectors.toList()),
                 safeAttachmentsDos.stream().map(AspSafeAttachmentsDo::getId).collect(Collectors.joining(","))
-                , SPECIALEQUIPMENT);
+                , SAFETY_ATTACHMENT_VERIFICATION);
 
         // 收件箱
         String[] array = userInfo.stream().map(UserMailOrgVo::getEmail).filter(StringUtils::isNotBlank).toArray(String[]::new);
@@ -93,6 +94,6 @@ public class SecurityAttachmentsUrgingServiceImpl implements UrgingService {
         }
         // 发送通知邮件
         sendEmail(SAFETY_ATTACHMENT_VERIFICATION_URGING_TITLE, String.format(MAIL_CONTENT, currentUser.getName(), StringUtils.join(str, "\n")), array);
-        return null;
+        return R.ok("催办成功");
     }
 }

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

@@ -96,6 +96,6 @@ public class SpecialCertificateUrgingServiceImpl implements UrgingService {
         }
         // 发送通知邮件
         sendEmail(PERSONNEL_CERTIFICATES_URGING_TITLE, String.format(MAIL_CONTENT,currentUser.getName(), StringUtils.join(str, "\n")), array);
-        return R.ok();
+        return R.ok("催办成功");
     }
 }

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

@@ -94,6 +94,6 @@ public class SpecialEquipmentUrgingServiceImpl implements UrgingService {
 
         // 发送通知邮件
         sendEmail(SPECIALEQUIPMENT_URGING_TITLE, String.format(MAIL_CONTENT, currentUser.getName(), StringUtils.join(str, "\n")), array);
-        return R.ok();
+        return R.ok("催办成功");
     }
 }