From eea27b448ec2d289f5c9665bf4b3678d580457ee Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期二, 22 七月 2025 15:45:23 +0800 Subject: [PATCH] 三保变更基础代码,点检导出修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 165 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 122 insertions(+), 43 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java index 334fffc..fb90334 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java @@ -19,6 +19,7 @@ import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.StrUtils; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog; import org.jeecg.modules.eam.constant.*; @@ -47,6 +48,7 @@ import javax.annotation.Resource; import java.time.LocalDate; import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -90,6 +92,8 @@ private ISysDictService sysDictService; @Resource private ISysUserService sysUserService; + @Resource + private IEamBaseHFCodeService eamBaseHFCodeService; @Override public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) { @@ -170,6 +174,14 @@ */ @Override public JSONObject exportInspectionOrderBaseInfo(String equipmentCode, String inspectionDate) { + if (StrUtils.isEmpty(inspectionDate)) { + // 鑾峰彇褰撳墠鏃ユ湡 + LocalDate currentDate = LocalDate.now(); + // 瀹氫箟鏃ユ湡鏍煎紡 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 鏍煎紡鍖栧綋鍓嶆湀浠� + inspectionDate = currentDate.format(formatter); + } // 鍒涘缓缁撴灉瀵硅薄 JSONObject result = new JSONObject(); EamInspectionOrderBaseResponse eamInspectionOrderBaseResponse = eamInspectionOrderMapper.findInsOrderBaseInfo(equipmentCode, inspectionDate); @@ -189,6 +201,14 @@ */ @Override public JSONObject exportInspectionOrderDetailList(String equipmentCode, String inspectionDate) { + if (StrUtils.isEmpty(inspectionDate)) { + // 鑾峰彇褰撳墠鏃ユ湡 + LocalDate currentDate = LocalDate.now(); + // 瀹氫箟鏃ユ湡鏍煎紡 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 鏍煎紡鍖栧綋鍓嶆湀浠� + inspectionDate = currentDate.format(formatter); + } // 鍒涘缓缁撴灉瀵硅薄 JSONObject result = new JSONObject(); List<EamInsOrderDetailResultResponse> eamInsOrderDetailResultResponseList = eamInspectionOrderMapper.findInsOrderDetailList(equipmentCode, inspectionDate); @@ -232,19 +252,21 @@ for (int i = 1; i <= 31; i++) { if (collect.containsKey(i)) { String inspectionResult = ""; - switch (collect.get(i).getInspectionResult()) { - case "NORMAL": - inspectionResult = "鈭�"; - break; - case "ANOMALY": - inspectionResult = "脳"; - break; - case "FAULT": - inspectionResult = "鈻�"; - break; - case "CLOSE": - inspectionResult = "T"; - break; + if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) { + switch (collect.get(i).getInspectionResult()) { + case "NORMAL": + inspectionResult = "鈭�"; + break; + case "ANOMALY": + inspectionResult = "脳"; + break; + case "FAULT": + inspectionResult = "鈻�"; + break; + case "CLOSE": + inspectionResult = "T"; + break; + } } resultMap.put("inspectionResult" + i, inspectionResult); } else { @@ -265,6 +287,14 @@ */ @Override public JSONObject exportInspectionOrderDetailUserList(String equipmentCode, String inspectionDate) { + if (StrUtils.isEmpty(inspectionDate)) { + // 鑾峰彇褰撳墠鏃ユ湡 + LocalDate currentDate = LocalDate.now(); + // 瀹氫箟鏃ユ湡鏍煎紡 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 鏍煎紡鍖栧綋鍓嶆湀浠� + inspectionDate = currentDate.format(formatter); + } // 鍒涘缓缁撴灉瀵硅薄 JSONObject result = new JSONObject(); List<EamInsOrderDetailUserResponse> eamInsOrderDetailUserResponseList = eamInspectionOrderMapper.findInspectionOrderDetailUserList(equipmentCode, inspectionDate); @@ -308,6 +338,14 @@ */ @Override public JSONObject exportWeekInsDetailList(String equipmentCode, String inspectionDate) { + if (StrUtils.isEmpty(inspectionDate)) { + // 鑾峰彇褰撳墠鏃ユ湡 + LocalDate currentDate = LocalDate.now(); + // 瀹氫箟鏃ユ湡鏍煎紡 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 鏍煎紡鍖栧綋鍓嶆湀浠� + inspectionDate = currentDate.format(formatter); + } // 鍒涘缓缁撴灉瀵硅薄 JSONObject result = new JSONObject(); List<EamWeekInsDetailResultResponse> eamWeekInsDetailResultResponseList = eamInspectionOrderMapper.findWeekInsDetailList(equipmentCode, inspectionDate); @@ -333,36 +371,40 @@ resultMap.put("itemCode", weekInsDetailResultResponse.getItemCode()); resultMap.put("itemName", weekInsDetailResultResponse.getItemName()); resultMap.put("itemDemand", weekInsDetailResultResponse.getItemDemand()); - // 浣跨敤AtomicInteger浣滀负璁℃暟鍣紝浠�1寮�濮� - AtomicInteger counter = new AtomicInteger(1); Map<Integer, EamWeekInsDetailResultResponse> collect = weekInsDetailResultResponseList .stream() .collect(Collectors.toMap( - // 鍒嗙粍閿細浣跨敤鑷搴忓彿锛堜粠1寮�濮嬶級 - item -> counter.getAndIncrement(), + // 鍒嗙粍閿細浣跨敤planInspectionDate瀛楁钀藉湪鏈湀鐨勫懆鏁� + item -> { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(item.getPlanInspectionDate()); + return calendar.get(Calendar.WEEK_OF_MONTH); + }, // 鍊硷細鐩存帴浣跨敤褰撳墠瀵硅薄 item -> item, - // 鍚堝苟鍑芥暟锛氬綋鍚屼竴搴忓彿鏈夊涓璞℃椂锛堢悊璁轰笂涓嶄細鍙戠敓锛夛紝濡備綍澶勭悊 - (existing, replacement) -> existing, // 鑻ユ湁閲嶅閿紝淇濈暀宸插瓨鍦ㄧ殑瀵硅薄 + // 鍚堝苟鍑芥暟锛氬綋鍚屼竴鍛ㄦ湁澶氫釜瀵硅薄鏃讹紙鏍规嵁闇�姹備笉浼氬彂鐢燂紝浣嗕粛闇�鎻愪緵锛� + (existing, replacement) -> existing, // 鎸囧畾Map鐨勫叿浣撳疄鐜帮紙鍙�夛級 LinkedHashMap::new // 淇濇寔鎻掑叆椤哄簭 )); for (int i = 1; i <= 5; i++) { if (collect.containsKey(i)) { String inspectionResult = ""; - switch (collect.get(i).getInspectionResult()) { - case "NORMAL": - inspectionResult = "鈭�"; - break; - case "ANOMALY": - inspectionResult = "脳"; - break; - case "FAULT": - inspectionResult = "鈻�"; - break; - case "CLOSE": - inspectionResult = "T"; - break; + if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) { + switch (collect.get(i).getInspectionResult()) { + case "NORMAL": + inspectionResult = "鈭�"; + break; + case "ANOMALY": + inspectionResult = "脳"; + break; + case "FAULT": + inspectionResult = "鈻�"; + break; + case "CLOSE": + inspectionResult = "T"; + break; + } } resultMap.put("inspectionResult" + i, inspectionResult); } else { @@ -383,6 +425,14 @@ */ @Override public JSONObject exportWeekInsOrderDetailUserList(String equipmentCode, String inspectionDate) { + if (StrUtils.isEmpty(inspectionDate)) { + // 鑾峰彇褰撳墠鏃ユ湡 + LocalDate currentDate = LocalDate.now(); + // 瀹氫箟鏃ユ湡鏍煎紡 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM"); + // 鏍煎紡鍖栧綋鍓嶆湀浠� + inspectionDate = currentDate.format(formatter); + } // 鍒涘缓缁撴灉瀵硅薄 JSONObject result = new JSONObject(); List<EamWeekInsDetailUserResponse> eamWeekInsDetailUserResponseList = eamInspectionOrderMapper.findWeekInsOrderDetailUserList(equipmentCode, inspectionDate); @@ -394,12 +444,18 @@ Map<Integer, EamWeekInsDetailUserResponse> groupMap = eamWeekInsDetailUserResponseList .stream() .collect(Collectors.toMap( - // 鍒嗙粍閿細浣跨敤鑷搴忓彿锛堜粠1寮�濮嬶級 - item -> counter.getAndIncrement(), - // 鍊硷細鐩存帴浣跨敤褰撳墠瀵硅薄锛堜綔涓哄垵濮嬪�硷級 + // 鍒嗙粍閿細浣跨敤 planInspectionDate 瀛楁钀藉湪鏈湀鐨勫懆鏁� + item -> { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(item.getPlanInspectionDate()); + return calendar.get(Calendar.WEEK_OF_MONTH); + }, + // 鍊硷細鐩存帴浣跨敤褰撳墠瀵硅薄 item -> item, - // 鍚堝苟鍑芥暟锛氬綋鍚屼竴鈥滃ぉ鈥濇湁澶氫釜瀵硅薄鏃讹紝濡備綍澶勭悊锛堣繖閲岀ず渚嬪彇绗竴涓級 - (existing, replacement) -> existing // 鑻ユ湁閲嶅閿紝淇濈暀宸插瓨鍦ㄧ殑瀵硅薄 + // 鍚堝苟鍑芥暟锛氬綋鍚屼竴鍛ㄦ湁澶氫釜瀵硅薄鏃讹紙鏍规嵁闇�姹備笉浼氬彂鐢燂級 + (existing, replacement) -> existing, + // 浣跨敤 LinkedHashMap 淇濇寔鎻掑叆椤哄簭 + LinkedHashMap::new )); Map<String, Object> resultMap = new LinkedHashMap<>(); for (int i = 1; i <= 5; i++) { @@ -429,6 +485,12 @@ //淇敼鐘舵�� eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name()); eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0); + //HF鐮佸鐞� + EamBaseHFCode eamBaseHFCode = eamBaseHFCodeService.selectByCategory(HfTemplateCategoryEnum.INSPECTION.name()); + if (eamBaseHFCode == null) { + return Result.error("娣诲姞澶辫触,鏈厤缃偣妫�HF缂栫爜锛�"); + } + eamInspectionOrder.setHfCode(eamBaseHFCode.getHfCode()); save(eamInspectionOrder); //澶勭悊鏃ョ偣妫�鏄庣粏鏁版嵁 if (StrUtil.isNotBlank(eamInspectionOrderRequest.getStandardId())) { @@ -479,7 +541,7 @@ } else { eamInspectionOrder.setEquipmentId(equipment.getId()); } - flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + (equipment.getInstallationPosition() == null ? "" : ";瀹夎浣嶇疆: " + equipment.getInstallationPosition()), + flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode(), eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null); Map<String, Object> variables = new HashMap<>(); variables.put("dataId", eamInspectionOrder.getId()); @@ -603,6 +665,19 @@ throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒"); } + // 妫�鏌ュ懆淇濊繃鏈熸椂闂� + if (eamInspectionOrderRequest.getTableWeekDetailList() == null || eamInspectionOrderRequest.getTableWeekDetailList().isEmpty()) { + List<EamWeekInspectionDetail> weekInspectionDetailList = eamWeekInspectionDetailService.list(new LambdaQueryWrapper<EamWeekInspectionDetail>().eq(EamWeekInspectionDetail::getStandardId, eamInspectionOrderRequest.getStandardId()).between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(eamInspectionOrderRequest.getInspectionDate()), DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate()))); + if (weekInspectionDetailList != null && !weekInspectionDetailList.isEmpty()) { + if (StrUtil.isEmpty(eamInspectionOrderRequest.getOperator())) { + Date lastDate = DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate()); + if (DateUtils.isSameDay(lastDate, new Date())) { + throw new JeecgBootException("鏈懆鐐规鏈畬鎴愶紝璇疯繘琛屽~鎶ワ紒"); + } + } + } + } + // 璁剧疆娴佺▼鍙橀噺 setupProcessVariables(eamInspectionOrderRequest, eamInspectionOrder, user, equipment); @@ -616,9 +691,9 @@ updateEamInspectionOrder(eamInspectionOrder); //鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊 - if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) { - updateEamInspectionOrderDetail(eamInspectionOrder); - } +// if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) { +// updateEamInspectionOrderDetail(eamInspectionOrder); +// } return eamInspectionOrder; } catch (Exception e) { @@ -674,7 +749,10 @@ values.put("organization", "鐐规浜虹偣妫�缁撴潫"); values.put("comment", "鐐规浜虹偣妫�缁撴潫"); // 鑾峰彇涓嬩竴姝ユ墽琛屼汉 - List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), null, BusinessCodeConst.PCR0002); + List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0002); + if (CollectionUtil.isEmpty(userSelectors)) { + throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨宸ワ紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�"); + } List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList()); values.put("NextAssignee", userApprovalList); request.setComment("鐐规浜虹偣妫�缁撴潫"); @@ -684,13 +762,14 @@ values.put("organization", request.getConfirmComment()); values.put("comment", request.getConfirmComment()); values.put("confirmation", request.getConfirmDealType()); - request.setComment(request.getConfirmComment()); + request.setComment("缁翠慨宸ョ‘璁ょ粨鏉�"); if ("2".equals(request.getConfirmDealType())) { // 缁翠慨宸ラ┏鍥� List<String> usernames = new ArrayList<>(); usernames.add(order.getOperator()); order.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name()); values.put("NextAssignee", usernames); + request.setComment("缁翠慨宸ラ┏鍥炵粨鏉�"); } } request.setValues(values); -- Gitblit v1.9.3