设备之系统——消息提醒 V2.1

修复BUG 在推送验收后保养派发提醒未删除

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/dao/EquPartsSetoutTaskDao.java

@@ -16,11 +16,11 @@ import java.util.List;
 public interface EquPartsSetoutTaskDao extends BaseMapper<EquPartsSetoutTaskDo> {
     @Insert("<script>" +
             "insert into equ_parts_setout_task (ID,TENANTID,ROPTION,REMARK,CREATEDATE,CREATEUSERID,MODIFYDATE,MODIFYUSERID," +
-            "CREATEUSERNAME,MODIFYUSERNAME,MASTERID,PARTSID,PARTSCODE,PARTSNAME,PARTSIMG,SPECIFICATION,MODEL,UNIT,USENUMBER,INVENTORYNUMBER,OCCUPYNUMBER) values" +
+            "CREATEUSERNAME,MODIFYUSERNAME,MASTERID,PARTSID,PARTSCODE,PARTSNAME,PARTSIMG,SPECIFICATION,MODEL,UNIT,USENUMBER,INVENTORYNUMBER) values" +
             "<foreach collection='list' item='info' separator=','>" +
             "(#{info.id},#{info.tenantid},#{info.roption},#{info.remark},#{info.createdate},#{info.createuserid},#{info.modifydate}," +
             "#{info.modifyuserid},#{info.createusername},#{info.modifyusername},#{info.masterid},#{info.partsid},#{info.partscode}," +
-            "#{info.partsname},#{info.partsimg},#{info.specification},#{info.model},#{info.unit},#{info.usenumber},#{info.inventorynumber},#{info.occupynumber})" +
+            "#{info.partsname},#{info.partsimg},#{info.specification},#{info.model},#{info.unit},#{info.usenumber},#{info.inventorynumber})" +
             "</foreach>" +
             "</script>")
     void batchSave(@Param("list") List<EquPartsSetoutTaskDo> partsSetoutTaskDoList);

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

@@ -132,7 +132,7 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
                 maintenanceTaskDo.getOtherengineers());
 
         JSONArray data = JSONUtil.parseArray(commonFeginClient.list(new HashMap<String, Object>() {{
-            this.put("NOTIFYTYPE", "acceptmaintaintask");
+            this.put("NOTIFYTYPE", "maintain");
             this.put("ROPTION", id);
         }}).getData());
 

cx-equipment/cx-equipment-server/src/main/java/com/rongwei/bsserver/sys/controller/EquipmentSendNotifyController.java

@@ -27,7 +27,7 @@ public class EquipmentSendNotifyController {
 
 
     /**
-     * 根据任务ID发送维修 提醒
+     * 根据任务ID发送保养 提醒
      *
      * @param idGeneralDTO 保养任务ID
      * @return {@link R}