From 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期三, 13 十二月 2023 16:46:19 +0800 Subject: [PATCH] 修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 62 +++++++++++++++++++++++------- 1 files changed, 47 insertions(+), 15 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java index adc8d65..061f00a 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java @@ -25,6 +25,9 @@ import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.service.*; import org.jeecg.modules.eam.vo.CalibrationOrderPage; +import org.jeecg.modules.eam.vo.SysFileNameVo; +import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.service.ISysDepartService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -70,6 +73,15 @@ @Autowired private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService; + + @Autowired + private ITechnologyStatusService technologyStatusService; + + @Autowired + private ISysFileNameService sysFileNameService; + + @Autowired + private ISysDepartService sysDepartService; // @Autowired // private IUploadRelaService uploadRelaService; // @Autowired @@ -452,18 +464,22 @@ QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap()); Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize); IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper); -// for (CalibrationOrder record : pageList.getRecords()) { -// String id = record.getId(); -// String status = record.getStatus(); -// String managementMode = record.getManagementMode(); -// String equipmentId = record.getEquipmentId(); -// Equipment equipment = equipmentService.getById(equipmentId); -// if(equipment != null){ -// record.setEquipmentNum(equipment.getNum()); -// record.setEquipmentName(equipment.getName()); -// record.setEquipmentModel(equipment.getModel()); -// record.setEquipmentSpecification(equipment.getSpecification()); -// } + for (CalibrationOrder record : pageList.getRecords()) { + String id = record.getId(); + String status = record.getStatus(); + String managementMode = record.getManagementMode(); + String equipmentId = record.getEquipmentId(); + Equipment equipment = equipmentService.getById(equipmentId); + String useId = equipment.getUseId(); + SysDepart depart = sysDepartService.getById(useId); + if(equipment != null){ + record.setEquipmentNum(equipment.getNum()); + record.setEquipmentName(equipment.getName()); + record.setEquipmentModel(equipment.getModel()); + record.setEquipmentSpecification(equipment.getSpecification()); + record.setEquipmentImportance(equipment.getEquipmentImportanceId()); + record.setUseDepartName(depart.getDepartName()); + } // List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); // record.setPrecisionParameterList(precisionParameterList); // if("4".equals(status)){ @@ -489,7 +505,7 @@ // } // } // } -// } + } return Result.OK(pageList); } /** @@ -503,7 +519,7 @@ for (CalibrationOrderDetail calibrationOrderDetail : calibrationOrderDetails) { calibrationOrderDetailService.removeById(calibrationOrderDetail); } - addAndEdit(calibrationOrder); +// addAndEdit(calibrationOrder); return Result.OK("缂栬緫鎴愬姛!"); } @@ -532,10 +548,26 @@ public Result<String> addNew(@RequestBody CalibrationOrder calibrationOrder) { calibrationOrder.setStatus("1"); calibrationOrderService.save(calibrationOrder); - addAndEdit(calibrationOrder); + + String equipmentId = calibrationOrder.getEquipmentId(); + Equipment equipment = equipmentService.getById(equipmentId); + String equipmentImportance = equipment.getEquipmentImportanceId(); + if("D".equals(equipmentImportance)){ + this.createTechnologyStatus(calibrationOrder); + } + +// addAndEdit(calibrationOrder); return Result.OK("娣诲姞鎴愬姛锛�"); } + void createTechnologyStatus(CalibrationOrder calibrationOrder){ + List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9"); + TechnologyStatus technologyStatus = new TechnologyStatus(); + technologyStatus.setOrderId(calibrationOrder.getId()); + technologyStatus.setReceipts(sysFileName.get(0).getReceipts()); + technologyStatusService.save(technologyStatus); + } + /** * 璁惧妫�瀹氬伐鍗� 鍒涘缓鏃堕�氳繃璁惧鑾峰彇璁惧绮惧害鍙傛暟 * qsw 2023-7-18 -- Gitblit v1.9.3