lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -21,6 +21,7 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import org.jeecg.modules.eam.service.*; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; @@ -170,9 +171,16 @@ // maintenanceStandard.setType("daily"); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); maintenanceStandard.setWritePerson(sysUser.getRealname()); maintenanceStandard.setAssignMode("1"); maintenanceStandardService.save(maintenanceStandard); Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist(); for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) { if(maintenanceCycle.size() > 0){ maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue()); } maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId()); maintenanceStandardDetail.setPhoto(maintenanceStandardDetail.getPhoto()); maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail); @@ -200,8 +208,13 @@ maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail); } //2.重新持久保养项目 Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); List<MaintenanceStandardDetail> maintenanceStandardDetails = maintenanceStandard.getMaintenanceStandardDetaillist(); for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetails) { if(maintenanceCycle.size() > 0){ maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue()); } maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId()); maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail); } @@ -545,15 +558,20 @@ //明细信息 List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist(); MaintenanceStandardDetail isd = null; Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) { isd = new MaintenanceStandardDetail(); isd.setMaintenanceStandardId(maintenanceStandard.getId()); isd.setLocation(maintenanceStandardDetail.getLocation()); isd.setPhoto(maintenanceStandardDetail.getPhoto()); isd.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId()); isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId()); // isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId()); isd.setMaintenanceMode(maintenanceStandardDetail.getMaintenanceMode()); isd.setMaintenanceRequire(maintenanceStandardDetail.getMaintenanceRequire()); if(maintenanceCycle.size() > 0){ isd.setMaintenanceCycleId(maintenanceCycle.get(0).getValue()); } maintenanceStandardDetailService.save(isd); } if(CollectionUtils.isNotEmpty(maintenanceStandardPlanningMaterialList)){ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
@@ -158,7 +158,7 @@ */ @GetMapping("getPeriodicMaintenanceCycle") public Result<?> getPeriodicMaintenanceCycle(@RequestParam("equipmentId") String equipmentId) { Equipment equipment = equipmentService.getById(equipmentId); Equipment equipment = equipmentService.getById(equipmentId); List<MaintenanceCycleVo> maintenanceCycles = maintenanceStandardDetailService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId()); return Result.ok(maintenanceCycles); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
@@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.eam.entity.DailyInspectionStandard; import org.jeecg.modules.eam.entity.MaintenanceStandard; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import java.util.List; import java.util.Map; /** @@ -22,4 +25,6 @@ IPage<Map<String, Object>> getMaintenanceStandard3List(IPage<Map> pageData, @Param("params") Map<String,Object> params); @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.maintenance_type = #{maintenanceType} and t1.equipment_importance_id like concat('%',#{importanceFlag},'%')") List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml
@@ -45,6 +45,9 @@ <if test="params.equipmentNum != null and params.equipmentNum != ''"> and t2.num like concat('%',#{params.equipmentNum},'%') </if> <if test="params.maintenanceType != null and params.maintenanceType != ''"> and t1.maintenance_type = #{params.maintenanceType} </if> ORDER BY t1.create_time desc </select> @@ -91,6 +94,9 @@ <if test="params.equipmentNum != null and params.equipmentNum != ''"> and t2.num like concat('%',#{params.equipmentNum},'%') </if> <if test="params.maintenanceType != null and params.maintenanceType != ''"> and t1.maintenance_type = #{params.maintenanceType} </if> ORDER BY t1.create_time desc </select> @@ -122,6 +128,8 @@ t1.lose_efficacy_time as loseEfficacyTime, t1.approval_status as approvalStatus, t8.item_text as approvalStatusName, t1.maintenance_type as maintenanceType, t9.item_text as maintenanceTypeName, t1.audit_feedback as auditFeedback, t1.approval_feedback as approvalFeedback, t1.write_person as writePerson, @@ -137,6 +145,7 @@ left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value left join sys_depart t7 on t2.use_id = t7.id left join (select * from v_sys_dict where dict_code = 'approval_status') t8 on t1.approval_status = t8.item_value left join (select * from v_sys_dict where dict_code = 'maintenance_type') t9 on t1.maintenance_type = t9.item_value where t1.del_flag = 0 and t1.type = #{params.type} <if test="params.num != null and params.num != ''"> and t1.num like concat('%',#{params.num},'%') @@ -150,6 +159,9 @@ <if test="params.equipmentNum != null and params.equipmentNum != ''"> and t2.num like concat('%',#{params.equipmentNum},'%') </if> <if test="params.maintenanceType != null and params.maintenanceType != ''"> and t1.maintenance_type = #{params.maintenanceType} </if> ORDER BY t1.create_time desc </select> </mapper> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java
@@ -3,7 +3,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.eam.entity.MaintenanceStandard; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import java.util.List; import java.util.Map; /** @@ -19,4 +21,6 @@ IPage<Map<String, Object>> getMaintenanceStandard2List(Integer pageNo, Integer pageSize, Map<String, Object> params); IPage<Map<String, Object>> getMaintenanceStandard3List(Integer pageNo, Integer pageSize, Map<String, Object> params); List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
@@ -7,10 +7,12 @@ import org.jeecg.modules.eam.entity.MaintenanceStandard; import org.jeecg.modules.eam.mapper.DailyInspectionStandardMapper; import org.jeecg.modules.eam.mapper.MaintenanceStandardMapper; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import org.jeecg.modules.eam.service.IDailyInspectionStandardService; import org.jeecg.modules.eam.service.IMaintenanceStandardService; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; /** @@ -39,4 +41,13 @@ IPage<Map> pageData = new Page<Map>(pageNo, pageSize); return super.baseMapper.getMaintenanceStandard3List(pageData,params); } /** * 周期性保养 根据设备台账ABC标识获取三保保养周期 * @return */ @Override public List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag, String maintenanceType) { return super.baseMapper.getPeriodicMaintenanceCycle(importanceFlag,maintenanceType); } }
