pms 瑞鹰 瑞恒 填报 审批页面 返回队伍名称

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -124,6 +124,10 @@ public class IotRhDailyReportController {
         // 查询当前日报关联的 部门下 增压机 的产能
         BigDecimal capacity = iotRhDailyReportService.queryCapacity(iotRhDailyReport.getDeptId());
         IotRhDailyReportRespVO result = BeanUtils.toBean(iotRhDailyReport, IotRhDailyReportRespVO.class);
+        if (ObjUtil.isNotEmpty(iotRhDailyReport.getDeptId())) {
+            DeptDO dept = deptService.getDept(iotRhDailyReport.getDeptId());
+            result.setDeptName(dept.getName());
+        }
         result.setCapacity(capacity);
         // 查询日报关联的项目 任务信息
         Long projectId = result.getProjectId();

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/IotRyDailyReportController.java

@@ -104,6 +104,10 @@ public class IotRyDailyReportController {
             return success(null);
         }
         IotRyDailyReportRespVO result = BeanUtils.toBean(iotRyDailyReport, IotRyDailyReportRespVO.class);
+        if (ObjUtil.isNotEmpty(iotRyDailyReport.getDeptId())) {
+            DeptDO dept = deptService.getDept(iotRyDailyReport.getDeptId());
+            result.setDeptName(dept.getName());
+        }
         // 查询日报对应的 项目 任务
         Long projectId = iotRyDailyReport.getProjectId();
         Long taskId = iotRyDailyReport.getTaskId();

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

@@ -93,17 +93,17 @@ public class PmsMessage {
             }
             // 瑞鹰钻井日报
             if (PmsConstants.RY_DAILY_REPORT_APPROVAL.equals(businessType)) {
-                msg = "您有新的生产日报 " + name + "需要审批，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+                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")+"]";
+                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")+"]";
+                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")+"]";
+                msg = "您有新的修井生产日报 " + name + "需要填报，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }
 
             if (PmsConstants.GENERATE_OPERATION.equals(businessType)) {