xg

“linengliang”

2024-03-15 6a3591c42a84b36d24d75f4584f0eeb145bb4de7

xg

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

@@ -1008,5 +1008,22 @@
         }
         return Result.ok(equipmentListAllStandards);
     }
     @GetMapping(value = "/planEquipmentList")
     @PermissionData
     public Result<IPage<Equipment>> planEquipmentList(Equipment equipment,
                                                      @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.orderByAsc("next_third_maintenance_time");
         //如果startTime和endTime不为空，则查询下次三保时间在这个时间段内的设备
         if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
             queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
         }
         Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
         IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java

@@ -408,6 +408,14 @@
    /**工段*/
    @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    private String areaId;
    @TableField(exist = false)
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date startTime;
    @TableField(exist = false)
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date endTime;


}