lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -781,6 +781,8 @@ inspectionResultVo.setWeekOfMonth((Integer)r.get("weekOfMonth")); inspectionResultVo.setInsResult((String)r.get("insResult")); listS.add(inspectionResultVo); hashMap.put("dataList",listS);//---- maps.add(hashMap); } }else{ @@ -833,6 +835,7 @@ inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName")); inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth")); listIn.add(inspectionResultVo); hashMap.put("dataList",listIn);//--- hashMap.put("dataList",listIn); } }else{ @@ -884,6 +887,8 @@ inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth")); listRe.add(inspectionResultVo); hashMap.put("dataList",listRe); maps3.add(hashMap);//--- } }else{ HashMap<String, Object> hashMap = new HashMap<>(); lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -199,11 +199,21 @@ maintenanceStandard.setAssignMode("1"); maintenanceStandardService.save(maintenanceStandard); Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.OK("没有找到的保养周期，请先维护保养周期!"); List<MaintenanceCycleVo> maintenanceCycle = null; if("2".equals(maintenanceType)){ maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.error("没有找到的二保保养周期，请先维护保养周期!"); } }else{ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.error("没有找到的三保保养周期，请先维护保养周期!"); } } List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist(); for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) { if(maintenanceCycle.size() > 0){ @@ -241,8 +251,24 @@ maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail); } //2.重新持久保养项目 Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); // Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); // List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); List<MaintenanceCycleVo> maintenanceCycle = null; if("2".equals(maintenanceStandard.getMaintenanceType())){ maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.error("没有找到的二保保养周期，请先维护保养周期!"); } }else{ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.error("没有找到的三保保养周期，请先维护保养周期!"); } } if(maintenanceCycle.size()==0){ return Result.OK("没有找到的保养周期，请先维护保养周期!"); } @@ -622,8 +648,23 @@ //明细信息 List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist(); MaintenanceStandardDetail isd = null; Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); // Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); List<MaintenanceCycleVo> maintenanceCycle = null; if("2".equals(maintenanceStandard.getMaintenanceType())){ maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.error("没有找到的二保保养周期，请先维护保养周期!"); } }else{ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId()); maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); if(maintenanceCycle.size()==0){ return Result.error("没有找到的三保保养周期，请先维护保养周期!"); } } // List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType()); for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) { isd = new MaintenanceStandardDetail(); isd.setMaintenanceStandardId(maintenanceStandard.getId()); lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java
@@ -42,6 +42,7 @@ /**产品损失情况*/ @Excel(name = "产品损失情况", width = 15) @ApiModelProperty(value = "产品损失情况") @Dict(dicCode = "is_product") private String condition; /**损失情况分析*/ @Excel(name = "损失情况分析", width = 15) lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
@@ -25,6 +25,9 @@ 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}") List<MaintenanceCycleVo> getPeriodic2MaintenanceCycle(String maintenanceType); @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 = #{importanceFlag}") List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType); List<MaintenanceCycleVo> getPeriodic3MaintenanceCycle(String importanceFlag,String maintenanceType); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -332,7 +332,7 @@ <if test="dataTime == null and dataTime == ''"> AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 ) </if> and t3.name = #{name} and t3.detection_standard = #{detectionStandard} and t3.name = #{name} and t3.detection_standard = #{detectionStandard} order by t2.create_time desc </select> <!-- <if test="dataTime != null and dataTime != ''">--> <!-- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )--> @@ -361,7 +361,7 @@ <if test="dataTime == null and dataTime == ''"> AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 ) </if> and t3.cycle_unit = #{cycleUnit} and t3.cycle_unit = #{cycleUnit} order by t1.create_time desc </select> <!-- <if test="dataTime != null and dataTime != ''">--> <!-- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )--> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java
@@ -22,5 +22,6 @@ IPage<Map<String, Object>> getMaintenanceStandard3List(Integer pageNo, Integer pageSize, Map<String, Object> params); List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType); List<MaintenanceCycleVo> getPeriodic2MaintenanceCycle(String maintenanceType); List<MaintenanceCycleVo> getPeriodic3MaintenanceCycle(String importanceFlag,String maintenanceType); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
@@ -66,7 +66,13 @@ * @return */ @Override public List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag, String maintenanceType) { return super.baseMapper.getPeriodicMaintenanceCycle(importanceFlag,maintenanceType); public List<MaintenanceCycleVo> getPeriodic3MaintenanceCycle(String importanceFlag, String maintenanceType) { return super.baseMapper.getPeriodic3MaintenanceCycle(importanceFlag,maintenanceType); } @Override public List<MaintenanceCycleVo> getPeriodic2MaintenanceCycle(String maintenanceType) { return super.baseMapper.getPeriodic2MaintenanceCycle(maintenanceType); } }
