保养修改

qushaowei

2025-06-10 7a90b194a7d1a213d01c323fd90ef5afbdeb4ea7

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -1190,7 +1190,7 @@
                MessageDTO messageDTO = new MessageDTO();
                messageDTO.setTitle(headInfo);
                messageDTO.setFromUser("数据导入小助手-小导");
                messageDTO.setCategory("导入操作附加信息");
                messageDTO.setCategory("导入信息");
                messageDTO.setContent(exceptionInfo);
                messageDTO.setToUser(user.getUsername());
                sysBaseApi.sendSysAnnouncement(messageDTO);
@@ -1315,13 +1315,27 @@
                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                         HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
//       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
       QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
       String num = equipment.getNum();
       if(StringUtils.isNotBlank(num)){
          queryWrapper.like("num",num);
       }
       String name = equipment.getName();
       if(StringUtils.isNotBlank(name)){
          queryWrapper.like("name",name);
       }
       String workCenterId = equipment.getWorkCenterId();
       if(StringUtils.isNotBlank(workCenterId)){
          queryWrapper.eq("work_center_id",workCenterId);
       }
       //根据下次三保时间排序
       queryWrapper.orderByAsc("next_third_maintenance_time");

       //如果startTime和endTime不为空，则查询下次三保时间在这个时间段内的设备
       if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
          queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
       }
       queryWrapper.orderByAsc("next_third_maintenance_time");
       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
       return Result.OK(pageList);