设备子系统———大修发送超期申请消息表业务id字段存值调整

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/EquipmentSendNotifyService.java

@@ -55,10 +55,10 @@ public interface EquipmentSendNotifyService {
      * @param planyear
      * @param belongfactory
      * @param taskquantity
-     * @param fileItemId
+     * @param taskId
      * @param userId
      */
-    void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String fileItemId,List<String> userId);
+    void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId,List<String> userId,String fileItemId);
 
     /**
      * 设备报废通知提醒

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquOverhaulPlanningTasksServiceImpl.java

@@ -187,7 +187,6 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
                     }
                     dataMap.put("list",dataList);
                     Workbook workbook = ExcelExportUtil.exportExcel(params,dataMap);
-                    //3数据填充生成文件
                     String fileItemId = ExcelUtils.workBookCommonUpload(workbook,  PLANNING_TASK_FILE_NAME.split("\\.")[0], "."+ PLANNING_TASK_FILE_NAME.split("\\.")[1]);
                     List<String> useDeptRoleUserIds = commonDao.getRoleUserIds("'车间主任','车间维修主管'","so.id in ("+ workShopUserIds.stream().distinct().collect(Collectors.joining(","))+")");
                     List<String> factoryRoleUserIds = commonDao.getRoleUserIds("'设备部部门长','设备部维修主管'", "(so.FULLPID like '," + planningTasksVo.getTenantid() + "%' or so.ID='" + planningTasksVo.getTenantid() + "')");
@@ -199,7 +198,7 @@ public class EquOverhaulPlanningTasksServiceImpl extends ServiceImpl<EquOverhaul
                         userId = useDeptRoleUserIds.stream().distinct().collect(Collectors.toList());
                     }
                     try {
-                        equipmentSendNotifyService.sendPlanningTasksNotify(planningTasksVo.getPlanyear(),planningTasksVo.getBelongfactory(),planningTasksVo.getTaskquantity(), fileItemId,userId);
+                        equipmentSendNotifyService.sendPlanningTasksNotify(planningTasksVo.getPlanyear(),planningTasksVo.getBelongfactory(),planningTasksVo.getTaskquantity(), planningTasksVo.getId(),userId,fileItemId);
                     }catch (Exception e){
                         ExceptionUtils.printExceptionDetail(e,"发送消息异常");
                     }

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/EquipmentSendNotifyServiceImpl.java

@@ -209,12 +209,12 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
     }
 
     @Override
-    public void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String fileItemId,List<String> userId) {
-        CXCommonUtils.deleteSendNotify("mobilePlanningTask", fileItemId);
+    public void sendPlanningTasksNotify(String planyear, String belongfactory, Integer taskquantity, String taskId,List<String> userId,String fileItemId) {
+        CXCommonUtils.deleteSendNotify("mobilePlanningTask", null);
         // 发送消息提醒
         CXCommonUtils.sendNotify(PLANNING_TASK_TITLE,
                 String.format(PLANNING_TASK_CONTENT, planyear, belongfactory, taskquantity),
-                null, userId.stream().distinct().collect(Collectors.toList()), fileItemId, MOBILE_PLANNING_TASK, true);
+                null, userId.stream().distinct().collect(Collectors.toList()), taskId, MOBILE_PLANNING_TASK, true);
     }
 
     /**