pms 瑞鹰 日报 区分钻井 修井 消息

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/constant/PmsConstants.java

@@ -18,9 +18,14 @@ public interface PmsConstants {
     String RH_DAILY_REPORT = "rhDailyReport";
     String RH_DAILY_REPORT_APPROVAL = "rhReportApproval";
 
+    // 瑞鹰钻井日报
     String RY_DAILY_REPORT = "ryDailyReport";
     String RY_DAILY_REPORT_APPROVAL = "ryReportApproval";
 
+    // 瑞鹰修井日报
+    String RY_XJ_DAILY_REPORT = "ryXjDailyReport";
+    String RY_XJ_DAILY_REPORT_APPROVAL = "ryXjReportApproval";
+
     String MAINTAIN_OUT = "maintainOut";
     String MAINTAIN_OUT_TEMPLATE = "maintain-out";
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/dailyreport/CreateRyDailyReportOrderJob.java

@@ -264,7 +264,7 @@ public class CreateRyDailyReportOrderJob implements JobHandler {
                         try {
                             if (reportMobilePair.containsKey(report.getId())) {
                                 String mobile = reportMobilePair.get(report.getId());
-                                pmsMessage.sendMessage(report.getId(), finalMsgTitle, PmsConstants.RY_DAILY_REPORT,
+                                pmsMessage.sendMessage(report.getId(), finalMsgTitle, PmsConstants.RY_XJ_DAILY_REPORT,
                                         Long.valueOf(report.getCreator()), mobile);
                             }
                         } finally {

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/message/PmsMessage.java

@@ -91,12 +91,21 @@ public class PmsMessage {
             if (PmsConstants.RH_DAILY_REPORT.equals(businessType)) {
                 msg = "您有新的生产日报 " + name + "需要填报，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }
+            // 瑞鹰钻井日报
             if (PmsConstants.RY_DAILY_REPORT_APPROVAL.equals(businessType)) {
                 msg = "您有新的生产日报 " + name + "需要审批，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }
             if (PmsConstants.RY_DAILY_REPORT.equals(businessType)) {
                 msg = "您有新的生产日报 " + name + "需要填报，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }
+            // 瑞鹰修井日报
+            if (PmsConstants.RY_XJ_DAILY_REPORT_APPROVAL.equals(businessType)) {
+                msg = "您有新的生产日报 " + name + "需要审批，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            }
+            if (PmsConstants.RY_XJ_DAILY_REPORT.equals(businessType)) {
+                msg = "您有新的生产日报 " + name + "需要填报，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            }
+
             if (PmsConstants.GENERATE_OPERATION.equals(businessType)) {
                 msg = "您有新的运行记录工单 " + name + "，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotrydailyreport/IotRyDailyReportServiceImpl.java

@@ -261,12 +261,20 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
                                         }
                                         CountDownLatch latch = new CountDownLatch(users.size());
                                         String finalMsgTitle = msgTitle;
+                                        String constant;
+                                        if ("1".equals(iotRyDailyReport.getProjectClassification())) {
+                                            // 钻井
+                                            constant = PmsConstants.RY_DAILY_REPORT_APPROVAL;
+                                        } else {
+                                            // 修井
+                                            constant = PmsConstants.RY_XJ_DAILY_REPORT_APPROVAL;
+                                        }
                                         users.forEach((userId, user) -> {
                                             pmsThreadPoolTaskExecutor.execute(() -> {
                                                 try {
                                                     String mobile = user.getMobile();
                                                     if (StrUtil.isNotBlank(mobile) && StrUtil.isNotBlank(finalMsgTitle)) {
-                                                        pmsMessage.sendMessage(iotRyDailyReport.getId(), finalMsgTitle, PmsConstants.RY_DAILY_REPORT_APPROVAL,
+                                                        pmsMessage.sendMessage(iotRyDailyReport.getId(), finalMsgTitle, constant,
                                                                 userId, mobile);
                                                     }
                                                 } finally {
@@ -769,9 +777,17 @@ public class IotRyDailyReportServiceImpl implements IotRyDailyReportService {
                 AdminUserDO user = users.get(0);
                 String mobile = user.getMobile();
                 String finalMsgTitle = msgTitle;
+                String constant;
+                if ("1".equals(dailyReport.getProjectClassification())) {
+                    // 钻井
+                    constant = PmsConstants.RY_DAILY_REPORT;
+                } else {
+                    // 修井
+                    constant = PmsConstants.RY_XJ_DAILY_REPORT;
+                }
                 if (StrUtil.isNotBlank(mobile) && StrUtil.isNotBlank(finalMsgTitle) && StrUtil.isNotBlank(creator)) {
                     pmsThreadPoolTaskExecutor.execute(() -> {
-                        pmsMessage.sendMessage(dailyReport.getId(), finalMsgTitle, PmsConstants.RY_DAILY_REPORT, Long.valueOf(creator), mobile);
+                        pmsMessage.sendMessage(dailyReport.getId(), finalMsgTitle, constant, Long.valueOf(creator), mobile);
                     });
                 }
             }