lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -464,8 +464,8 @@ record.setEquipmentModel(equipment.getModel()); record.setEquipmentSpecification(equipment.getSpecification()); } List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); record.setPrecisionParameterList(precisionParameterList); // List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); // record.setPrecisionParameterList(precisionParameterList); // if("4".equals(status)){ // if("data".equals(managementMode)){ // List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
@@ -5,32 +5,33 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.entity.SysUpload; import org.jeecg.common.system.base.entity.SysUploadRela; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; 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; import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.service.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.jeecg.modules.system.entity.*; import org.jeecg.modules.system.service.*; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -69,6 +70,26 @@ @Autowired private IEamEquipmentService eamEquipmentService; @Autowired private IDailyInspectionStandardService dailyInspectionStandardService; @Autowired private IInspectionOrderService inspectionOrderService; @Autowired private IDailyMaintenanceOrderService dailyMaintenanceOrderService; @Resource private ISysRoleService sysRoleService; @Resource private ISysDictService sysDictService; @Resource private ISysDictItemService sysDictItemService; @Resource private ISysUserRoleService sysUserRoleService; @Resource private ISysUserService sysUserService; /** * 分页列表查询 @@ -134,21 +155,116 @@ // 更新主表为已完成 CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getCalibrationOrderId()); // status 已完成 calibrationOrder.setStatus("4"); calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult()); calibrationOrder.setCalibrationTime(new Date()); calibrationOrder.setStatus("2"); // 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); } // // 更新设备技术状态 // Equipment equipment = eamEquipmentService.getById(calibrationOrder.getEquipmentId()); // // if (StringUtils.isNotBlank(equipment.getId())) { // equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult()); // eamEquipmentService.updateById(equipment); // } return Result.ok("上传成功!"); } /** * 根据检定结果 修改设备技术状态 * @return */ // @PostMapping(value = "/editEquipmentTechnologyStatus") @RequestMapping(value = "/editEquipmentTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST}) @Transactional(rollbackFor = {Exception.class}) public Result<?> editEquipmentTechnologyStatus(@RequestBody CalibrationOrderReport calibrationOrderReport){ String status = calibrationOrderReport.getStatus(); CalibrationOrder calibrationOrder = calibrationOrderService.getById(calibrationOrderReport.getId()); if("3".equals(status)){//3:已驳回 calibrationOrder.setStatus("3"); calibrationOrder.setRemark(calibrationOrderReport.getRemark()); calibrationOrder.setCalibrationResult(calibrationOrderReport.getJudgmentResult()); calibrationOrderService.updateById(calibrationOrder); return Result.ok("驳回成功!"); }else{ calibrationOrder.setStatus("4"); calibrationOrder.setRemark(calibrationOrderReport.getRemark()); 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); this.equipmentTechnologyStatuAlart(equipment.getNum()); } String judgmentResult = calibrationOrderReport.getJudgmentResult(); if("disabledScrapping".equals(judgmentResult)){ this.cancleAllOrder(equipment.getId()); } return Result.ok("设备技术状态修改完成!"); } } void equipmentTechnologyStatuAlart(String equipmentNum){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false); SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text","运保设备管理员") .eq("dict_id",sysDict.getId()),false); String roleCode = sysDictItem.getItemValue(); SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false); List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId())); for(SysUserRole sysUserRole:sysUserRoles){ SysUser user = sysUserService.getById(sysUserRole.getUserId()); String msg = sysUser.getRealname()+"将统一编号为【"+equipmentNum+"】的技术状态修改为已禁用"; MessageDTO messageDTO = new MessageDTO(); messageDTO.setTitle("设备台账技术状态修改"); messageDTO.setContent(msg); messageDTO.setCategory("运保设备管理员"); messageDTO.setFromUser("设备台账技术状态修改提醒小助手"); messageDTO.setToUser(user.getUsername()); sysBaseApi.sendSysAnnouncement(messageDTO); } } void cancleAllOrder(String equipmentId){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //如果技术状态鉴定 为禁用（已提交报废） 状态 对应当前点检标准失效，改为统一的点检标准(徐静提供)，原点检工单、二保工单、三保工单全部取消， List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() .eq(DailyInspectionStandard::getVersionStatus, "2") .eq(DailyInspectionStandard::getEquipmentId, equipmentId) .eq(DailyInspectionStandard::getDelFlag, "0").list(); for (DailyInspectionStandard dailyInspectionStandard : dailyInspectionStandards) { dailyInspectionStandard.setVersionStatus("3"); dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname()); dailyInspectionStandard.setLoseEfficacyTime(new Date()); dailyInspectionStandardService.updateById(dailyInspectionStandard); } List<InspectionOrder> inspectionOrders = inspectionOrderService.lambdaQuery() .eq(InspectionOrder::getStatus, "1") .eq(InspectionOrder::getEquipmentId, equipmentId) .eq(InspectionOrder::getDelFlag, "0").list(); for (InspectionOrder inspectionOrder : inspectionOrders) { inspectionOrder.setStatus("7"); inspectionOrderService.updateById(inspectionOrder); } List<DailyMaintenanceOrder> dailyMaintenanceOrders = dailyMaintenanceOrderService.lambdaQuery() .eq(DailyMaintenanceOrder::getStatus, "1") .eq(DailyMaintenanceOrder::getEquipmentId, equipmentId) .eq(DailyMaintenanceOrder::getDelFlag, "0").list(); for (DailyMaintenanceOrder dailyMaintenanceOrder : dailyMaintenanceOrders) { dailyMaintenanceOrder.setStatus("7"); dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder); } } @PostMapping(value = "/edit") @Transactional(rollbackFor = {Exception.class}) public Result<?> edit(MultipartHttpServletRequest request, HttpServletResponse response) throws Exception { lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -147,17 +147,19 @@ record.put("maintenanceCycles", maintenanceCycles); List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id); //统计工时定额 BigDecimal workingHourQuota = new BigDecimal(0); for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){ if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){ Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota"); BigDecimal workingHour = new BigDecimal(wh); workingHourQuota = workingHourQuota.add(workingHour); } } record.put("workingHourQuota",workingHourQuota); record.put("dailyMaintenanceDetails", dailyMaintenanceDetails); //统计工时定额 // BigDecimal workingHourQuota = new BigDecimal(0); // for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){ // if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){ // Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota"); // BigDecimal workingHour = new BigDecimal(wh); // workingHourQuota = workingHourQuota.add(workingHour); // } // } // record.put("workingHourQuota",workingHourQuota); /** * 复选框 不可编辑 */ @@ -170,41 +172,28 @@ /** * 统计实际工时 */ QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>(); actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0); actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity"); Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper); BigDecimal actualQuantity = new BigDecimal(0); if (map != null) { actualQuantity = (BigDecimal) map.get("actualQuantity"); } record.put("actualWorkingHourQuota", actualQuantity); // QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>(); // actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0); // actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity"); // Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper); // BigDecimal actualQuantity = new BigDecimal(0); // if (map != null) { // actualQuantity = (BigDecimal) map.get("actualQuantity"); // } // record.put("actualWorkingHourQuota", actualQuantity); List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery() .eq(FinishTransferOrder::getMaintenanceOrderId, id) .eq(FinishTransferOrder::getEquipmentId, equipmentId).list(); for (FinishTransferOrder finishTransferOrder : finishTransferOrders) { String operateUser = finishTransferOrder.getOperateUser(); if(StringUtils.isNotBlank(operateUser)){ SysUser sysUser = sysUserService.getById(operateUser); record.put("operateUserName", sysUser.getRealname()); } record.put("operateUserName", operateUser); String repairUser = finishTransferOrder.getRepairUser(); if(StringUtils.isNotBlank(repairUser)){ SysUser sysUser = sysUserService.getById(repairUser); record.put("repairUserName", sysUser.getRealname()); } record.put("repairUserName", repairUser); String repairDirectorUser = finishTransferOrder.getRepairDirectorUser(); if(StringUtils.isNotBlank(repairDirectorUser)){ SysUser sysUser = sysUserService.getById(repairDirectorUser); record.put("repairDirectorUserName", sysUser.getRealname()); } record.put("repairDirectorUserName", repairDirectorUser); String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser(); if(StringUtils.isNotBlank(equipmentInspectorUser)){ SysUser sysUser = sysUserService.getById(equipmentInspectorUser); record.put("equipmentInspectorUserName", sysUser.getRealname()); } record.put("equipmentInspectorUserName", equipmentInspectorUser); } } @@ -229,15 +218,15 @@ List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id); //统计工时定额 BigDecimal workingHourQuota = new BigDecimal(0); for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){ if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){ Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota"); BigDecimal workingHour = new BigDecimal(wh); workingHourQuota = workingHourQuota.add(workingHour); } } record.put("workingHourQuota",workingHourQuota); // BigDecimal workingHourQuota = new BigDecimal(0); // for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){ // if(dailyMaintenanceOrderDetail.get("workingHourQuota") != null){ // Integer wh = (Integer)dailyMaintenanceOrderDetail.get("workingHourQuota"); // BigDecimal workingHour = new BigDecimal(wh); // workingHourQuota = workingHourQuota.add(workingHour); // } // } // record.put("workingHourQuota",workingHourQuota); record.put("dailyMaintenanceDetails", dailyMaintenanceDetails); /** * 复选框 不可编辑 @@ -251,15 +240,15 @@ /** * 统计实际工时 */ QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>(); actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0); actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity"); Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper); BigDecimal actualQuantity = new BigDecimal(0); if (map != null) { actualQuantity = (BigDecimal) map.get("actualQuantity"); } record.put("actualWorkingHourQuota", actualQuantity); // QueryWrapper<MaintenanceOrderActualWorkingHour> actualWorkingHourWrapper = new QueryWrapper<>(); // actualWorkingHourWrapper.eq("maintenance_order_id", id).eq("del_flag", 0); // actualWorkingHourWrapper.select("sum(actual_working_hour_quota) as actualQuantity"); // Map<String, Object> map = maintenanceOrderActualWorkingHourService.getMap(actualWorkingHourWrapper); // BigDecimal actualQuantity = new BigDecimal(0); // if (map != null) { // actualQuantity = (BigDecimal) map.get("actualQuantity"); // } // record.put("actualWorkingHourQuota", actualQuantity); /** *获取是否为炉类设备标记 @@ -638,8 +627,8 @@ FinishTransferOrder finishTransferOrder = new FinishTransferOrder(); finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId()); finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId()); finishTransferOrder.setOperateUser(userId); finishTransferOrder.setRepairUser(userId); // finishTransferOrder.setOperateUser(userId); // finishTransferOrder.setRepairUser(userId); finishTransferOrder.setStatus("1"); finishTransferOrder.setDelFlag(0); finishTransferOrderService.save(finishTransferOrder); @@ -736,42 +725,73 @@ @Transactional(rollbackFor = { Exception.class }) public Result<String> approve(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); String orderId = dailyMaintenanceOrder.getId(); String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3(); String confirmStatus = dailyMaintenanceOrder.getConfirmStatus(); DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId); String equipmentId = maintenanceOrder.getEquipmentId(); String confirmStatus = maintenanceOrder.getConfirmStatus(); String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3(); if(StringUtils.isBlank(orderUda3)){ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3); } List<FinishTransferOrder> finishTransferOrders = finishTransferOrderService.lambdaQuery() .eq(FinishTransferOrder::getMaintenanceOrderId, orderId) .eq(FinishTransferOrder::getEquipmentId, equipmentId).list(); if(finishTransferOrders.size()>0){ FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0); if ("0".equals(confirmStatus)){ finishTransferOrder.setRepairDirectorUser(userId); if("1".equals(confirmStatus)){ finishTransferOrder.setOperateUser(sysUser.getRealname()); finishTransferOrderService.updateById(finishTransferOrder); if(StringUtils.isBlank(orderUda3)){ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3); } maintenanceOrder.setConfirmStatus("1"); maintenanceOrder.setConfirmStatus(confirmStatus); dailyMaintenanceOrderService.updateById(maintenanceOrder); }else{ finishTransferOrder.setEquipmentInspectorUser(userId); }else if("2".equals(confirmStatus)){ finishTransferOrder.setEquipmentInspectorUser(""); finishTransferOrder.setRepairDirectorUser(""); finishTransferOrder.setRepairUser(""); finishTransferOrder.setOperateUser(""); finishTransferOrderService.updateById(finishTransferOrder); if(StringUtils.isBlank(orderUda3)){ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3); } maintenanceOrder.setConfirmStatus("2"); maintenanceOrder.setConfirmStatus(confirmStatus); dailyMaintenanceOrderService.updateById(maintenanceOrder); }else if("3".equals(confirmStatus)){ finishTransferOrder.setRepairUser(sysUser.getRealname()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); dailyMaintenanceOrderService.updateById(maintenanceOrder); }else if("4".equals(confirmStatus)){ finishTransferOrder.setEquipmentInspectorUser(""); finishTransferOrder.setRepairDirectorUser(""); finishTransferOrder.setRepairUser(""); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); dailyMaintenanceOrderService.updateById(maintenanceOrder); }else if("5".equals(confirmStatus)){ finishTransferOrder.setRepairDirectorUser(sysUser.getRealname()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); dailyMaintenanceOrderService.updateById(maintenanceOrder); }else if("6".equals(confirmStatus)){ finishTransferOrder.setRepairDirectorUser(""); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); dailyMaintenanceOrderService.updateById(maintenanceOrder); }else if("7".equals(confirmStatus)){ finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname()); finishTransferOrderService.updateById(finishTransferOrder); maintenanceOrder.setConfirmStatus(confirmStatus); maintenanceOrder.setStatus("8"); dailyMaintenanceOrderService.updateById(maintenanceOrder); } } return Result.OK("审批成功!"); }
@@ -117,7 +117,7 @@ @ApiModelProperty(value = "备注") private String remark; @ApiModelProperty(value = "移交确认状态（0未确认，1主任确认，2检验员确认）") @ApiModelProperty(value = "二保移交单确认状态（0未确认，1操作员确认，2驳回操作员，3维修确认，4驳回维修员，5维修室主任确认，6驳回维修室主任，7设备检验员确认）") private String confirmStatus; @ApiModelProperty(value = "精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））") lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -80,10 +80,12 @@ t1.create_time as createTime, t1.remark, t1.description, t1.confirm_status as confirmStatus, t1.precision_inspection_status as precisionInspectionStatus, t1.maintenance_order_uda3 as receipts, t12.num as receiptsNum, t13.item_text as receiptsName t13.item_text as receiptsName, t14.item_text as confirmStatusName FROM mom_eam_daily_maintenance_order t1 LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id @@ -98,6 +100,7 @@ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type left join sys_file_name t12 on t1.maintenance_order_uda3 = t12.id left join (SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name') t13 on t13.item_value = t12.name left join (SELECT * FROM v_sys_dict WHERE dict_code = 'two_maintenance_devolution_status') t14 on t14.item_value = t1.confirm_status WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType} <if test="params.num != null and params.num != ''"> and t1.num like concat('%',#{params.num},'%')
