保养批量指派fegin调用删除消息提醒修改sql update 跟新；保养润滑字段中润滑量从 数据类型切换成字符串类型250g 数据存储问题

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

@@ -2,6 +2,8 @@ package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.EquMaintenanceTaskDo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @author shangmi
@@ -10,4 +12,6 @@ import com.rongwei.bsentity.domain.EquMaintenanceTaskDo;
  * @description 保养检修任务
  */
 public interface EquMaintenanceTaskDao extends BaseMapper<EquMaintenanceTaskDo> {
+    @Update(" UPDATE sys_notify_announce SET DELETED='1',MODIFYDATE=NOW() WHERE NOTIFYTYPE = #{notifytype} AND ROPTION = #{roption} AND DELETED='0'")
+    int deleteNotice(@Param("notifytype") String notifytype, @Param("roption") String roption);
 }

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

@@ -20,4 +20,6 @@ public interface EquMaintenanceTaskService extends IService<EquMaintenanceTaskDo
     List<EquMaintenanceTaskDo> getListByYearAndMonth(int year, int month);
 
     List<EquMaintenanceTaskDo> getListByTimeQuantum(int year, int month,boolean stride);
+
+    int deleteNotice(String notifytype, String roption);
 }

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

@@ -82,4 +82,14 @@ public class EquMaintenanceTaskServiceImpl extends ServiceImpl<EquMaintenanceTas
                 .eq(EquMaintenanceTaskDo::getMonth,month));
         return maintenanceTaskDao.selectList(queryWrapper);
     }
+
+    /**
+     * 删除对应的消息提醒记录
+     * @return
+     */
+    @Override
+    public int deleteNotice(String notifytype, String roption) {
+
+        return maintenanceTaskDao.deleteNotice(notifytype,roption);
+    }
 }

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

@@ -84,6 +84,8 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
     @Autowired
     private SysFileItemService sysFileItemService;
 
+
+
     /**
      * 根据任务ID发送 提醒
      *
@@ -129,7 +131,8 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
                     maintenanceTaskDo.getWorkshop(), maintenanceTaskDo.getEquipmentname(), maintenanceTaskDo.getEquipmentnumber(),
                     maintenanceTaskDo.getMaintenancesite(), maintenanceTaskDo.getPrincipal(), maintenanceTaskDo.getOtherengineers());
             // 删除提醒
-            CXCommonUtils.deleteSendNotify("maintain", id);
+       //     CXCommonUtils.deleteSendNotify("maintain", id);
+            maintenanceTaskService.deleteNotice("maintain", id);
 
             // 发送提醒
             CXCommonUtils.sendNotify(title, context, null, userId.stream().distinct().collect(Collectors.toList()),

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationPlanDetailDo.java

@@ -66,7 +66,7 @@ public class EquLubricationPlanDetailDo extends BaseDo implements Serializable {
      * 润滑量
      */
     @TableField("LUBRICATIONAMOUNT")
-    private BigDecimal lubricationamount;
+    private String lubricationamount;
 
     /**
      * 频率

cx-equipment/cx-equipment-entity/src/main/java/com/rongwei/bsentity/domain/EquLubricationTaskDetailDo.java

@@ -67,7 +67,7 @@ public class EquLubricationTaskDetailDo extends BaseDo implements Serializable {
      * 润滑量
      */
     @TableField("LUBRICATIONAMOUNT")
-    private BigDecimal lubricationamount;
+    private String lubricationamount;
 
     /**
      * 频率