设备之系统——消息提醒 V3.3 BUG

设备查询条件出错 修改查询条件

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

@@ -67,7 +67,7 @@ public class EquMaintenanceTaskServiceImpl extends ServiceImpl<EquMaintenanceTas
     @Override
     public List<EquMaintenanceTaskDo> getListByTimeQuantum(String newDate, String oldDate) {
         LambdaQueryWrapper<EquMaintenanceTaskDo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(EquMaintenanceTaskDo::getTaskstart, Arrays.asList(10,30,70))
+        queryWrapper.in(EquMaintenanceTaskDo::getTaskstate, Arrays.asList("10","30","70"))
                 .lt(EquMaintenanceTaskDo::getCreatedate,newDate)
                 .ge(EquMaintenanceTaskDo::getCreatedate,oldDate)
                 .eq(EquMaintenanceTaskDo::getDeleted,0);

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

@@ -362,8 +362,8 @@ public class EquipmentSendNotifyServiceImpl implements EquipmentSendNotifyServic
         calendar.setTime(date);
         calendar.set(Calendar.DAY_OF_MONTH,1);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String newDate = simpleDateFormat.format(date);
-        calendar.set(Calendar.MONTH, -12);
+        String newDate = simpleDateFormat.format(calendar.getTime());
+        calendar.set(Calendar.MONTH, -11);
         String oldDate = simpleDateFormat.format(calendar.getTime());
         // 查询距近一年时间内未完成保养/润滑任务
         List<EquMaintenanceTaskDo> maintenanceTaskDoList = maintenanceTaskService.getListByTimeQuantum(newDate, oldDate);