From f9da745966deaead45d1f6c7427c2e2ce633741f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 14:50:39 +0800
Subject: [PATCH] art: 增加点注释
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 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 5b07bb6..574d216 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
@@ -198,11 +198,13 @@
for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) {
String id = inspectionOrder.getId();
String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId();
+ //鐐规椤圭洰id
String inspectionProjectId = inspectionOrderDetail.getInspectionProjectId();
-
+ //鐐规鏍囧噯
DailyInspectionStandardDetail dailyInspectionStandardDetail = dailyInspectionStandardDetailService.getById(inspectionStandardDetailId);
+ //鐐规椤圭洰
InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId);
-
+ //鐐规鏄庣粏娣诲姞
inspectionOrderDetail.setId("");
inspectionOrderDetail.setInspectionOrderId(id);
inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation());
@@ -217,6 +219,7 @@
inspectionOrderDetailService.save(inspectionOrderDetail);
}
}else{
+ //鐢熶骇绾胯澶囷紝鎸夌収鐢熶骇绾挎潵杩涜鐐规
String lineId = equipment.getLineId();
List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
.eq(DailyInspectionStandard::getEquipmentId, lineId)
@@ -610,11 +613,8 @@
@RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findDayInspectionProjectList(pageNo, 1000, params);
List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
-
List<Map<String, Object>> maps = new ArrayList<>();
-
for (Map<String, Object> record : records) {
-
if(maps.size()>0){
Boolean flag = false;
for (Map<String, Object> map : maps) {
@@ -641,13 +641,49 @@
hashMap.put(record.get("createTime").toString(),record.get("insResult"));
maps.add(hashMap);
}
-// hashMap.put("name",record.get("name"));
-// hashMap.put("equipmentNum",record.get("equipmentNum"));
-// hashMap.put("equipmentName",record.get("equipmentName"));
-// hashMap.put("detectionStandard",record.get("detectionStandard"));
-// hashMap.put(record.get("createTime").toString(),record.get("insResult"));
}
-// maps.add(hashMap);
+ return Result.ok(maps);
+ }
+
+ /**
+ *鐢熶骇璁惧鑷富缁存姢鍛ㄧ偣妫�琛� 鎶ヨ〃
+ * 2024-3-27 qsw
+ */
+ @GetMapping("findWeekInspectionProjectList")
+ public Result<?> findWeekInspectionProjectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> dayInspectionProjectList = inspectionOrderService.findWeekInspectionProjectList(pageNo, 1000, params);
+ List<Map<String, Object>> records = dayInspectionProjectList.getRecords();
+ List<Map<String, Object>> maps = new ArrayList<>();
+ for (Map<String, Object> record : records) {
+ if(maps.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map : maps) {
+ if(map.containsValue(record.get("name")) && map.containsValue(record.get("detectionStandard"))){
+ map.put(record.get("createTime").toString(),record.get("insResult"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("name",record.get("name"));
+ hashMap.put("equipmentNum",record.get("equipmentNum"));
+ hashMap.put("equipmentName",record.get("equipmentName"));
+ hashMap.put("detectionStandard",record.get("detectionStandard"));
+ hashMap.put(record.get("createTime").toString(),record.get("insResult"));
+ maps.add(hashMap);
+ }
+ }
return Result.ok(maps);
}
--
Gitblit v1.9.3