From ac4d1a5962441156ff22a0c87f4eacc083daa9a6 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 20 六月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 277 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index ea4d9df..c5a3769 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -24,6 +24,7 @@
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +33,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* @Description: 鐐规宸ュ崟
@@ -328,4 +331,278 @@
return super.importExcel(request, response, EamInspectionOrder.class);
}
+ /**
+ * 鎶ヨ〃浣跨敤 qsw
+ * 2025-6-19
+ */
+ @GetMapping("/findInspectionResult")
+ public JSONObject findInspectionResult(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+
+ String equipmentId = (String)params.get("equipmentId");
+ String inspectionDate = (String)params.get("inspectionDate");
+
+ List<InspectionVo> inspectionVos = new ArrayList<>();
+ List<Map<String, Object>> inspectionStandard = eamInspectionOrderService.findInspectionStandard(equipmentId);
+ for (Map<String, Object> map : inspectionStandard) {
+ List<InspectionVo> dayInspectionResult = eamInspectionOrderService.findInspectionResult(equipmentId,(String)map.get("itemDemand"),inspectionDate);
+ InspectionVo inspectionVo = new InspectionVo();
+ inspectionVo.setInspectionContent((String)map.get("itemDemand"));
+ Object seq = map.get("seq");
+ inspectionVo.setSeq(seq.toString());
+ for (InspectionVo vo : dayInspectionResult) {
+ if("1".equals(vo.getDayTime())){
+ inspectionVo.setDay1(vo.getInspectionResult());
+ continue;
+ }else if("2".equals(vo.getDayTime())){
+ inspectionVo.setDay2(vo.getInspectionResult());
+ continue;
+ }else if("3".equals(vo.getDayTime())){
+ inspectionVo.setDay3(vo.getInspectionResult());
+ continue;
+ }else if("4".equals(vo.getDayTime())){
+ inspectionVo.setDay4(vo.getInspectionResult());
+ continue;
+ }else if("5".equals(vo.getDayTime())){
+ inspectionVo.setDay5(vo.getInspectionResult());
+ continue;
+ }else if("6".equals(vo.getDayTime())){
+ inspectionVo.setDay6(vo.getInspectionResult());
+ continue;
+ }else if("7".equals(vo.getDayTime())){
+ inspectionVo.setDay7(vo.getInspectionResult());
+ continue;
+ }else if("8".equals(vo.getDayTime())){
+ inspectionVo.setDay8(vo.getInspectionResult());
+ continue;
+ }else if("9".equals(vo.getDayTime())){
+ inspectionVo.setDay9(vo.getInspectionResult());
+ continue;
+ }else if("10".equals(vo.getDayTime())){
+ inspectionVo.setDay10(vo.getInspectionResult());
+ continue;
+ }else if("11".equals(vo.getDayTime())){
+ inspectionVo.setDay11(vo.getInspectionResult());
+ continue;
+ }else if("12".equals(vo.getDayTime())){
+ inspectionVo.setDay12(vo.getInspectionResult());
+ continue;
+ }else if("13".equals(vo.getDayTime())){
+ inspectionVo.setDay13(vo.getInspectionResult());
+ continue;
+ }else if("14".equals(vo.getDayTime())){
+ inspectionVo.setDay14(vo.getInspectionResult());
+ continue;
+ }else if("15".equals(vo.getDayTime())){
+ inspectionVo.setDay15(vo.getInspectionResult());
+ continue;
+ }else if("16".equals(vo.getDayTime())){
+ inspectionVo.setDay16(vo.getInspectionResult());
+ continue;
+ }else if("17".equals(vo.getDayTime())){
+ inspectionVo.setDay17(vo.getInspectionResult());
+ continue;
+ }else if("18".equals(vo.getDayTime())){
+ inspectionVo.setDay18(vo.getInspectionResult());
+ continue;
+ }else if("19".equals(vo.getDayTime())){
+ inspectionVo.setDay19(vo.getInspectionResult());
+ continue;
+ }else if("20".equals(vo.getDayTime())){
+ inspectionVo.setDay20(vo.getInspectionResult());
+ continue;
+ }else if("21".equals(vo.getDayTime())){
+ inspectionVo.setDay21(vo.getInspectionResult());
+ continue;
+ }else if("22".equals(vo.getDayTime())){
+ inspectionVo.setDay22(vo.getInspectionResult());
+ continue;
+ }else if("23".equals(vo.getDayTime())){
+ inspectionVo.setDay23(vo.getInspectionResult());
+ continue;
+ }else if("24".equals(vo.getDayTime())){
+ inspectionVo.setDay24(vo.getInspectionResult());
+ continue;
+ }else if("25".equals(vo.getDayTime())){
+ inspectionVo.setDay25(vo.getInspectionResult());
+ continue;
+ }else if("26".equals(vo.getDayTime())){
+ inspectionVo.setDay26(vo.getInspectionResult());
+ continue;
+ }else if("27".equals(vo.getDayTime())){
+ inspectionVo.setDay27(vo.getInspectionResult());
+ continue;
+ }else if("28".equals(vo.getDayTime())){
+ inspectionVo.setDay28(vo.getInspectionResult());
+ continue;
+ }else if("29".equals(vo.getDayTime())){
+ inspectionVo.setDay29(vo.getInspectionResult());
+ continue;
+ }else if("30".equals(vo.getDayTime())){
+ inspectionVo.setDay30(vo.getInspectionResult());
+ continue;
+ }else if("31".equals(vo.getDayTime())){
+ inspectionVo.setDay31(vo.getInspectionResult());
+ continue;
+ }
+ }
+ inspectionVos.add(inspectionVo);
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",inspectionVos);
+ return jsonObject;
+ }
+
+ /**
+ * 鎶ヨ〃浣跨敤 qsw
+ * 2025-6-19
+ */
+ @GetMapping("/findInspectionUser")
+ public JSONObject findInspectionUser(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+
+ String equipmentId = (String)params.get("equipmentId");
+ String inspectionDate = (String)params.get("inspectionDate");
+
+ List<InspectionVo> inspectionVos = new ArrayList<>();
+ List<InspectionVo> inspectionUser = eamInspectionOrderService.findInspectionUser(equipmentId,inspectionDate);
+ InspectionVo inspectionVo = new InspectionVo();
+ for (InspectionVo vo : inspectionUser) {
+ if("1".equals(vo.getDayTime())){
+ inspectionVo.setOperator1(vo.getOperator());
+ inspectionVo.setConfirmUser1(vo.getConfirmUser());
+ continue;
+ }else if("2".equals(vo.getDayTime())){
+ inspectionVo.setOperator2(vo.getOperator());
+ inspectionVo.setConfirmUser2(vo.getConfirmUser());
+ continue;
+ }else if("3".equals(vo.getDayTime())){
+ inspectionVo.setOperator3(vo.getOperator());
+ inspectionVo.setConfirmUser3(vo.getConfirmUser());
+ continue;
+ }else if("4".equals(vo.getDayTime())){
+ inspectionVo.setOperator4(vo.getOperator());
+ inspectionVo.setConfirmUser4(vo.getConfirmUser());
+ continue;
+ }else if("5".equals(vo.getDayTime())){
+ inspectionVo.setOperator5(vo.getOperator());
+ inspectionVo.setConfirmUser5(vo.getConfirmUser());
+ continue;
+ }else if("6".equals(vo.getDayTime())){
+ inspectionVo.setOperator6(vo.getOperator());
+ inspectionVo.setConfirmUser6(vo.getConfirmUser());
+ continue;
+ }else if("7".equals(vo.getDayTime())){
+ inspectionVo.setOperator7(vo.getOperator());
+ inspectionVo.setConfirmUser7(vo.getConfirmUser());
+ continue;
+ }else if("8".equals(vo.getDayTime())){
+ inspectionVo.setOperator8(vo.getOperator());
+ inspectionVo.setConfirmUser8(vo.getConfirmUser());
+ continue;
+ }else if("9".equals(vo.getDayTime())){
+ inspectionVo.setOperator9(vo.getOperator());
+ inspectionVo.setConfirmUser9(vo.getConfirmUser());
+ continue;
+ }else if("10".equals(vo.getDayTime())){
+ inspectionVo.setOperator10(vo.getOperator());
+ inspectionVo.setConfirmUser10(vo.getConfirmUser());
+ continue;
+ }else if("11".equals(vo.getDayTime())){
+ inspectionVo.setOperator11(vo.getOperator());
+ inspectionVo.setConfirmUser11(vo.getConfirmUser());
+ continue;
+ }else if("12".equals(vo.getDayTime())){
+ inspectionVo.setOperator12(vo.getOperator());
+ inspectionVo.setConfirmUser12(vo.getConfirmUser());
+ continue;
+ }else if("13".equals(vo.getDayTime())){
+ inspectionVo.setOperator13(vo.getOperator());
+ inspectionVo.setConfirmUser13(vo.getConfirmUser());
+ continue;
+ }else if("14".equals(vo.getDayTime())){
+ inspectionVo.setOperator14(vo.getOperator());
+ inspectionVo.setConfirmUser14(vo.getConfirmUser());
+ continue;
+ }else if("15".equals(vo.getDayTime())){
+ inspectionVo.setOperator15(vo.getOperator());
+ inspectionVo.setConfirmUser15(vo.getConfirmUser());
+ continue;
+ }else if("16".equals(vo.getDayTime())){
+ inspectionVo.setOperator16(vo.getOperator());
+ inspectionVo.setConfirmUser16(vo.getConfirmUser());
+ continue;
+ }else if("17".equals(vo.getDayTime())){
+ inspectionVo.setOperator17(vo.getOperator());
+ inspectionVo.setConfirmUser17(vo.getConfirmUser());
+ continue;
+ }else if("18".equals(vo.getDayTime())){
+ inspectionVo.setOperator18(vo.getOperator());
+ inspectionVo.setConfirmUser18(vo.getConfirmUser());
+ continue;
+ }else if("19".equals(vo.getDayTime())){
+ inspectionVo.setOperator19(vo.getOperator());
+ inspectionVo.setConfirmUser19(vo.getConfirmUser());
+ continue;
+ }else if("20".equals(vo.getDayTime())){
+ inspectionVo.setOperator20(vo.getOperator());
+ inspectionVo.setConfirmUser20(vo.getConfirmUser());
+ continue;
+ }else if("21".equals(vo.getDayTime())){
+ inspectionVo.setOperator21(vo.getOperator());
+ inspectionVo.setConfirmUser21(vo.getConfirmUser());
+ continue;
+ }else if("22".equals(vo.getDayTime())){
+ inspectionVo.setOperator22(vo.getOperator());
+ inspectionVo.setConfirmUser22(vo.getConfirmUser());
+ continue;
+ }else if("23".equals(vo.getDayTime())){
+ inspectionVo.setOperator23(vo.getOperator());
+ inspectionVo.setConfirmUser23(vo.getConfirmUser());
+ continue;
+ }else if("24".equals(vo.getDayTime())){
+ inspectionVo.setOperator24(vo.getOperator());
+ inspectionVo.setConfirmUser24(vo.getConfirmUser());
+ continue;
+ }else if("25".equals(vo.getDayTime())){
+ inspectionVo.setOperator25(vo.getOperator());
+ inspectionVo.setConfirmUser25(vo.getConfirmUser());
+ continue;
+ }else if("26".equals(vo.getDayTime())){
+ inspectionVo.setOperator26(vo.getOperator());
+ inspectionVo.setConfirmUser26(vo.getConfirmUser());
+ continue;
+ }else if("27".equals(vo.getDayTime())){
+ inspectionVo.setOperator27(vo.getOperator());
+ inspectionVo.setConfirmUser27(vo.getConfirmUser());
+ continue;
+ }else if("28".equals(vo.getDayTime())){
+ inspectionVo.setOperator28(vo.getOperator());
+ inspectionVo.setConfirmUser28(vo.getConfirmUser());
+ continue;
+ }else if("29".equals(vo.getDayTime())){
+ inspectionVo.setOperator29(vo.getOperator());
+ inspectionVo.setConfirmUser29(vo.getConfirmUser());
+ continue;
+ }else if("30".equals(vo.getDayTime())){
+ inspectionVo.setOperator30(vo.getOperator());
+ inspectionVo.setConfirmUser30(vo.getConfirmUser());
+ continue;
+ }else if("31".equals(vo.getDayTime())){
+ inspectionVo.setOperator31(vo.getOperator());
+ inspectionVo.setConfirmUser31(vo.getConfirmUser());
+ continue;
+ }
+ }
+ inspectionVos.add(inspectionVo);
+// }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("data",inspectionVos);
+ return jsonObject;
+ }
+
+
+
}
--
Gitblit v1.9.3