art: 所有设备 台账 合并 保养标准菜单，增加 有无点检标准，有无二保标准，有无三保标准

zhangherong

2025-03-04 6419162a10ee7979644d98d394e7d2f0875bd37b

art: 所有设备 台账 合并 保养标准菜单，增加 有无点检标准，有无二保标准，有无三保标准

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

@@ -306,9 +306,41 @@
                                                      @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());
         Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
         IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
         List<Equipment> list = pageList.getRecords();
         list.forEach(equip -> {
             String id = equip.getId();
             List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                     .eq(DailyInspectionStandard::getEquipmentId, id)
                     .eq(DailyInspectionStandard::getVersionStatus, "2")
                     .list();
             if (dailyInspectionStandards.size() > 0) {
                 equip.setYseNoInspectionStandard("0");
             } else {
                 equip.setYseNoInspectionStandard("1");
             }
             List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
                     .eq(MaintenanceStandard::getEquipmentId, id)
                     .eq(MaintenanceStandard::getMaintenanceType, "2")
                     .eq(MaintenanceStandard::getVersionStatus, "2").list();
             if (maintenance2Standards.size() > 0) {
                 equip.setYseNoMaintenance2Standard("0");
             } else {
                 equip.setYseNoMaintenance2Standard("1");
             }

             List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
                     .eq(MaintenanceStandard::getEquipmentId, id)
                     .eq(MaintenanceStandard::getMaintenanceType, "3")
                     .eq(MaintenanceStandard::getVersionStatus, "2").list();
             if (maintenance3Standards.size() > 0) {
                 equip.setYseNoMaintenance3Standard("0");
             } else {
                 equip.setYseNoMaintenance3Standard("1");
             }
         });
         return Result.OK(pageList);
     }


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

@@ -417,5 +417,12 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    @TableField(exist = false)
    private String yseNoInspectionStandard;
    @TableField(exist = false)
    private String yseNoMaintenance2Standard;
    @TableField(exist = false)
    private String yseNoMaintenance3Standard;


}