lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -452,44 +452,44 @@ 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()); } List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); record.setPrecisionParameterList(precisionParameterList); if("4".equals(status)){ if("data".equals(managementMode)){ List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() .eq(CalibrationOrderDetail::getCalibrationOrderId, id) .eq(CalibrationOrderDetail::getJudgmentResult, "fail") .eq(CalibrationOrderDetail::getDelFlag,"0").list(); if(calibrationOrderDetails.size()>0){ record.setCalibrationResult("异常"); }else{ record.setCalibrationResult("正常"); } }else{ List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() .eq(CalibrationOrderReport::getCalibrationOrderId, id) .eq(CalibrationOrderReport::getJudgmentResult, "fail") .eq(CalibrationOrderReport::getDelFlag, "0").list(); if(calibrationOrderReports.size()>0){ record.setCalibrationResult("异常"); }else{ record.setCalibrationResult("正常"); } } } } // 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()); // } // List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); // record.setPrecisionParameterList(precisionParameterList); // if("4".equals(status)){ // if("data".equals(managementMode)){ // List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() // .eq(CalibrationOrderDetail::getCalibrationOrderId, id) // .eq(CalibrationOrderDetail::getJudgmentResult, "fail") // .eq(CalibrationOrderDetail::getDelFlag,"0").list(); // if(calibrationOrderDetails.size()>0){ // record.setCalibrationResult("异常"); // }else{ // record.setCalibrationResult("正常"); // } // }else{ // List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() // .eq(CalibrationOrderReport::getCalibrationOrderId, id) // .eq(CalibrationOrderReport::getJudgmentResult, "fail") // .eq(CalibrationOrderReport::getDelFlag, "0").list(); // if(calibrationOrderReports.size()>0){ // record.setCalibrationResult("异常"); // }else{ // record.setCalibrationResult("正常"); // } // } // } // } return Result.OK(pageList); } /** lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
@@ -1,9 +1,6 @@ package org.jeecg.modules.eam.controller; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -13,6 +10,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.entity.SysUpload; @@ -20,7 +18,9 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.StrUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.entity.CalibrationOrder; import org.jeecg.modules.eam.entity.CalibrationOrderReport; import org.jeecg.modules.eam.entity.Equipment; import org.jeecg.modules.eam.entity.EquipmentDocument; import org.jeecg.modules.eam.service.ICalibrationOrderReportService; @@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.eam.service.ICalibrationOrderService; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -61,7 +63,12 @@ private ICalibrationOrderReportService calibrationOrderReportService; @Autowired private ICalibrationOrderService calibrationOrderService; @Autowired private ISysBaseAPI sysBaseApi; @Autowired private IEamEquipmentService eamEquipmentService; /** * 分页列表查询 @@ -75,10 +82,7 @@ //@AutoLog(value = "mom_eam_calibration_order_report-分页列表查询") @ApiOperation(value="mom_eam_calibration_order_report-分页列表查询", notes="mom_eam_calibration_order_report-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CalibrationOrderReport>> queryPageList(CalibrationOrderReport calibrationOrderReport, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { public Result<IPage<CalibrationOrderReport>> queryPageList(CalibrationOrderReport calibrationOrderReport, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper<CalibrationOrderReport> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrderReport, req.getParameterMap()); Page<CalibrationOrderReport> page = new Page<CalibrationOrderReport>(pageNo, pageSize); IPage<CalibrationOrderReport> pageList = calibrationOrderReportService.page(page, queryWrapper); @@ -105,6 +109,7 @@ CalibrationOrderReport calibrationOrderReport = json.toJavaObject(CalibrationOrderReport.class); calibrationOrderReport.setType(fileType); calibrationOrderReportService.save(calibrationOrderReport); // 文件变更 if (isFileChange) { if (StrUtils.isNotBlankOrNull(uploadId)) { @@ -126,6 +131,20 @@ sysBaseApi.saveOrUpdateUploadRale(calibrationOrderReport.getId(), type, sysUploads.get(0).getId()); } } // 更新主表为已完成 CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getCalibrationOrderId()); // status 已完成 calibrationOrder.setStatus("4"); calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult()); calibrationOrder.setCalibrationTime(new Date()); calibrationOrderService.updateById(calibrationOrder); // 更新设备技术状态 Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId()); if (StringUtils.isNotBlank(equipment.getId())) { equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult()); eamEquipmentService.updateById(equipment); } return Result.ok("上传成功!"); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -468,34 +468,34 @@ @GetMapping(value = "/getResumeCalibrationRecordList") public Result<?> getResumeCalibrationRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) { IPage<Map<String, Object>> resumeCalibrationRecordList = equipmentService.getResumeCalibrationRecordList(pageNo, pageSize, params); for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) { String id = (String)record.get("id"); String status = (String)record.get("status"); String managementMode = (String)record.get("managementMode"); if("4".equals(status)){ if("data".equals(managementMode)){ List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() .eq(CalibrationOrderDetail::getCalibrationOrderId, id) .eq(CalibrationOrderDetail::getJudgmentResult, "fail") .eq(CalibrationOrderDetail::getDelFlag,"0").list(); if(calibrationOrderDetails.size()>0){ record.put("calibrationResult","异常"); }else{ record.put("calibrationResult","正常常"); } }else{ List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() .eq(CalibrationOrderReport::getCalibrationOrderId, id) .eq(CalibrationOrderReport::getJudgmentResult, "fail") .eq(CalibrationOrderReport::getDelFlag, "0").list(); if(calibrationOrderReports.size()>0){ record.put("calibrationResult","异常"); }else{ record.put("calibrationResult","正常常"); } } } } // for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) { // String id = (String)record.get("id"); // String status = (String)record.get("status"); // String managementMode = (String)record.get("managementMode"); // if("4".equals(status)){ // if("data".equals(managementMode)){ // List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() // .eq(CalibrationOrderDetail::getCalibrationOrderId, id) // .eq(CalibrationOrderDetail::getJudgmentResult, "fail") // .eq(CalibrationOrderDetail::getDelFlag,"0").list(); // if(calibrationOrderDetails.size()>0){ // record.put("calibrationResult","异常"); // }else{ // record.put("calibrationResult","正常常"); // } // }else{ // List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() // .eq(CalibrationOrderReport::getCalibrationOrderId, id) // .eq(CalibrationOrderReport::getJudgmentResult, "fail") // .eq(CalibrationOrderReport::getDelFlag, "0").list(); // if(calibrationOrderReports.size()>0){ // record.put("calibrationResult","异常"); // }else{ // record.put("calibrationResult","正常常"); // } // } // } // } return Result.ok(resumeCalibrationRecordList); }
@@ -80,6 +80,7 @@ */ @Excel(name = "检定结果", width = 15) @ApiModelProperty(value = "检定结果") @Dict(dicCode = "technology_status") private String calibrationResult; /** * 检定结果描述 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderReportMapper.xml
@@ -17,7 +17,7 @@ left join mom_sys_upload_rela t4 on t4.bus_id = t1.id LEFT JOIN mom_sys_upload t2 ON t4.upload_id = t2.id LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'common_upload_type' ) t3 ON t3.item_value = t2.type LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'judgment_result' ) t5 ON t5.item_value = t1.judgment_result LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t5 ON t5.item_value = t1.judgment_result WHERE t1.del_flag = 0 <if test="params.calibrationOrderId != null and params.calibrationOrderId != ''"> and t1.calibration_order_id = #{params.calibrationOrderId} lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/CalibrationOrderServiceImpl.java
@@ -7,6 +7,7 @@ import org.jeecg.modules.eam.mapper.CalibrationOrderMapper; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import org.jeecg.modules.eam.service.ICalibrationOrderService; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -30,6 +31,7 @@ @Autowired private CalibrationOrderDetailMapper calibrationOrderDetailMapper; @Override @Transactional(rollbackFor = Exception.class) public void saveMain(CalibrationOrder calibrationOrder, List<CalibrationOrderDetail> calibrationOrderDetailList) {
