From ea42a1e743bf24bbc1648f7ea82ad1812e156eb4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 11:43:57 +0800
Subject: [PATCH] 设备点检报表
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index e874d7a..dcd01ca 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -8,6 +8,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -693,4 +694,101 @@
return Result.ok(maps);
}
-}
+
+ /**
+ *鐢熶骇璁惧鑷富缁存姢鐐规琛� 鎶ヨ〃
+ * 2024-3-27 qsw
+ */
+ @GetMapping("findInspectionForms")
+ public Result<?> findInspectionForms(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+
+// HashMap<String, Object> mapEquipment = new HashMap<>();
+// HashMap<String, Object> mapStandard = new HashMap<>();
+ HashMap<String, Object> mapResult = new HashMap<>();
+
+
+
+ String num = (String)params.get("num");
+ Equipment equipment = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getNum, num).eq(Equipment::getDelFlag, 0));
+
+// mapEquipment.put("num",equipment.getNum());
+
+
+ List<Map<String, Object>> list1 = this.getInspectionStandars(num);
+ List<Map<String, Object>> list2 = this.getUserQianzi(num);
+
+ mapResult.put("equipentNum",equipment.getNum());
+ mapResult.put("equipentName",equipment.getName());
+ mapResult.put("list1",list1);
+ mapResult.put("list2",list2);
+
+ return Result.ok(mapResult);
+ }
+
+ List<Map<String, Object>> getInspectionStandars(String num){
+ List<Map<String, Object>> maps = new ArrayList<>();
+ List<Map<String, Object>> dayInspectionStandard = inspectionOrderService.findDayInspectionStandard(num);
+ for (Map<String, Object> map : dayInspectionStandard) {
+ String name = (String)map.get("name");
+ String detectionStandard = (String)map.get("detectionStandard");
+ List<Map<String, Object>> record = inspectionOrderService.findDayInspectionStandardProject(name, detectionStandard);
+
+ for (Map<String, Object> r : record) {
+ if(maps.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map1 : maps) {
+ if(map1.containsValue(r.get("name")) && map1.containsValue(r.get("detectionStandard"))){
+ map1.put(r.get("dayTime").toString(),r.get("insResult"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",r.get("name"));
+ hashMap.put("detectionStandard",r.get("detectionStandard"));
+ hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
+ maps.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",r.get("name"));
+ hashMap.put("detectionStandard",r.get("detectionStandard"));
+ hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
+ maps.add(hashMap);
+
+ }
+ }
+ }
+ return maps;
+ }
+ List<Map<String, Object>> getUserQianzi(String num){
+ List<Map<String, Object>> maps2 = new ArrayList<>();
+ List<Map<String, Object>> userQianZi = inspectionOrderService.getUserQianZi(num);
+ for (Map<String, Object> map : userQianZi) {
+ if(maps2.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map1 : maps2) {
+ if(map1.containsValue("缁存姢璐ｄ换浜�")){
+ map1.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("inspectionUserName","缁存姢璐ｄ换浜�");
+ hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+ maps2.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("inspectionUserName","缁存姢璐ｄ换浜�");
+ hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
+ maps2.add(hashMap);
+ }
+ }
+ return maps2;
+ }
+
+ }
--
Gitblit v1.9.3