优化

“linengliang”

2023-11-27 bdcf57bd9679e916b378f1384d875dff6579033e

优化

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

@@ -851,7 +851,7 @@
                                                      HttpServletRequest req) {
         QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
         Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
         IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
         IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId(),standardDetail.getType());
         return Result.OK(pageList);
     }
     @PostMapping("addLine")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java

@@ -81,5 +81,5 @@
                                        @Param("lineId")String lineId,
                                       @Param("sql")String sql
    );
    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId);
    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -337,6 +337,7 @@
           on t8.id = t3.maintenance_cycle_id
           where  t4.version_status = '2') t9 where
           t9.equipmentId = #{mainId}
           and t9.type = #{type}
           order by t9.type
    </select>


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java

@@ -61,5 +61,5 @@
    public IPage<Equipment> pageEquipment(Integer pageNo, Integer pageSize, Map<String, Object> params);

    Page<Equipment> getEquipmentList(Page<Equipment> page, Equipment equipment);
    IPage<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page, String mainId);
    IPage<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type);
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -121,7 +121,7 @@
    }

    @Override
    public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId) {
        return page.setRecords(baseMapper.getStandardList(page,mainId));
    public IPage<DailyInspectionStandardDetail> getStandardList(Page<DailyInspectionStandardDetail> page, String mainId,String type) {
        return page.setRecords(baseMapper.getStandardList(page,mainId,type));
    }
}