[task-4854] 设备档案增加使用年限到期提醒

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/EquipmentMaintenancePlanJob.java

@@ -404,9 +404,10 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
             if("深圳恒生医院".equals(getSetting())){
                 futureDate = futureDate2 ;
                 str = "一个月";
-                eqMap.put("dueDate", dueDate.plusMonths(1).toString());
+                eqMap.put("dueDate", chuChangRiQi);
             }else{
-                eqMap.put("dueDate", dueDate.plusYears(1).toString());
+                //eqMap.put("dueDate", dueDate.plusYears(1).toString());
+                eqMap.put("dueDate", chuChangRiQi);
             }
             msgInnerList.add(eqMap);
 
@@ -449,7 +450,7 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
                         calendarPo.setCreateBy("1");
                         calendarPo.setType("EQUIP_OVERDUE");
                         calendarDao.create(calendarPo);
-                        sendMessage(msgInnerList,zhanghao);
+                        sendMessage(msgInnerList,zhanghao,calendarPo.getContent());
                         logger.warn("设备到期提醒"+yuanSheBeiBian +"：" + sheBeiMingCheng);
                     }
 
@@ -457,20 +458,11 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
             }
         }
     }
-    private void sendMessage(List<Map<String, Object>> list,String userIDs){
+    private void sendMessage(List<Map<String, Object>> list,String userIDs,String neiRong){
         if(BeanUtils.isNotEmpty(list) && BeanUtils.isNotEmpty(userIDs)){
             //转换接收人
             List<String> receiver = Arrays.asList(userIDs.split(","));
             String title = "设备使用到期预提醒";
-            String neiRong ="以下设备即将过期：<br>";
-            for (Map<String,Object> item : list) {
-                //拼接内容
-                if(neiRong.equals("以下设备即将过期：<br>")){
-                    neiRong = neiRong + "设备名称：" + item.get("she_bei_ming_cheng_").toString() + "-到期日期:" + item.get("dueDate").toString();
-                }else{
-                    neiRong = neiRong + "<br>" + "设备名称：" + item.get("she_bei_ming_cheng_").toString() + "-到期日期:" + item.get("dueDate").toString();
-                }
-            }
             MessageQueueProductorUtil.send("EquipmentMaintenancePlanJob", "system" , "inner", receiver,null , title, neiRong, null, null, null);
         }
     }