From e16cabb6f35597b97c770a9fa56de5bce4a4494e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 14:20:03 +0800
Subject: [PATCH] 数据格式修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java | 6 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java | 12 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 22 +++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java | 6 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 90 ++++++++++++++++++++++-------
5 files changed, 95 insertions(+), 41 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 dcd01ca..17a9be7 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
@@ -704,43 +704,50 @@
@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 equipmentNum = (String)params.get("num");
+ String dataTime = (String)params.get("dataTime");
+ Equipment equipment = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getNum, equipmentNum).eq(Equipment::getDelFlag, 0));
-
- 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);
+ List<Map<String, Object>> list1 = this.getInspectionStandars(equipmentNum,"day",dataTime);
+ List<Map<String, Object>> list2 = this.getUserQianzi(equipmentNum,"day");
+ List<Map<String, Object>> list3 = this.getCheckUserQianzi(equipmentNum,"day");
+ List<Map<String, Object>> list4 = this.getInspectionStandars(equipmentNum, "week",dataTime);
+ List<Map<String, Object>> list5 = this.getUserQianzi(equipmentNum,"week");
+ List<Map<String, Object>> list6 = this.getCheckUserQianzi(equipmentNum,"week");
mapResult.put("equipentNum",equipment.getNum());
mapResult.put("equipentName",equipment.getName());
mapResult.put("list1",list1);
mapResult.put("list2",list2);
+ mapResult.put("list3",list3);
+ mapResult.put("list4",list4);
+ mapResult.put("list5",list5);
+ mapResult.put("list6",list6);
return Result.ok(mapResult);
}
- List<Map<String, Object>> getInspectionStandars(String num){
+ List<Map<String, Object>> getInspectionStandars(String equipmentNum,String cycleUnit,String dataTime){
List<Map<String, Object>> maps = new ArrayList<>();
- List<Map<String, Object>> dayInspectionStandard = inspectionOrderService.findDayInspectionStandard(num);
+ List<Map<String, Object>> dayInspectionStandard = inspectionOrderService.findDayInspectionStandard(equipmentNum,cycleUnit);
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);
+ List<Map<String, Object>> record = inspectionOrderService.findDayInspectionStandardProject(equipmentNum,name, detectionStandard,dataTime);
+
+ List<Map<String, Object>> list = new ArrayList<>();
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"));
+// map1.put(r.get("dayTime").toString(),r.get("insResult"));
+ HashMap<String, Object> hashMap1 = new HashMap<>();
+ hashMap1.put(r.get("dayTime").toString(),r.get("insResult"));
+ list.add(hashMap1);
flag = true;
}
}
@@ -748,42 +755,52 @@
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"));
+
+// hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
+ HashMap<String, Object> hashMap1 = new HashMap<>();
+ hashMap1.put(r.get("dayTime").toString(),r.get("insResult"));
+ list.add(hashMap1);
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);
+// hashMap.put(r.get("dayTime").toString(),r.get("insResult"));
+ HashMap<String, Object> hashMap1 = new HashMap<>();
+ hashMap1.put(r.get("dayTime").toString(),r.get("insResult"));
+ list.add(hashMap1);
+ hashMap.put("dataList",list);
+
+ maps.add(hashMap);
}
}
}
return maps;
}
- List<Map<String, Object>> getUserQianzi(String num){
+
+ List<Map<String, Object>> getUserQianzi(String num,String cycleUnit){
List<Map<String, Object>> maps2 = new ArrayList<>();
- List<Map<String, Object>> userQianZi = inspectionOrderService.getUserQianZi(num);
+ List<Map<String, Object>> userQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit);
for (Map<String, Object> map : userQianZi) {
if(maps2.size()>0){
Boolean flag = false;
for (Map<String, Object> map1 : maps2) {
- if(map1.containsValue("缁存姢璐ｄ换浜�")){
+ 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("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("inspectionUserName","缁存姢璐ｄ换浜虹瀛�");
hashMap.put(map.get("dayTime").toString(),map.get("inspectionUserName"));
maps2.add(hashMap);
}
@@ -791,4 +808,31 @@
return maps2;
}
+ List<Map<String, Object>> getCheckUserQianzi(String num,String cycleUnit){
+ List<Map<String, Object>> maps3 = new ArrayList<>();
+ List<Map<String, Object>> checkUserQianZi = inspectionOrderService.getUserQianZi(num,cycleUnit);
+ for (Map<String, Object> map : checkUserQianZi) {
+ if(maps3.size()>0){
+ Boolean flag = false;
+ for (Map<String, Object> map1 : maps3) {
+ if(map1.containsValue("妫�鏌ヨ矗浠讳汉绛惧瓧")){
+ map1.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+ flag = true;
+ }
+ }
+ if(flag == false){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("repairConfirmPerson","妫�鏌ヨ矗浠讳汉绛惧瓧");
+ hashMap.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+ maps3.add(hashMap);
+ }
+ }else{
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("repairConfirmPerson","妫�鏌ヨ矗浠讳汉绛惧瓧");
+ hashMap.put(map.get("dayTime").toString(),map.get("repairConfirmPerson"));
+ maps3.add(hashMap);
+ }
+ }
+ return maps3;
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java
index b33ad56..2e93d0a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/InspectionOrderMapper.java
@@ -43,15 +43,15 @@
/**
* 鐐规鎶ヨ〃 new
*/
- List<Map<String, Object>> findDayInspectionStandard(@Param("equipmentId")String equipmentId);
+ List<Map<String, Object>> findDayInspectionStandard(@Param("equipmentNum")String equipmentNum,@Param("cycleUnit")String cycleUnit);
/**
* 鐐规鎶ヨ〃 new
*/
- List<Map<String, Object>> findDayInspectionStandardProject(@Param("name")String name,@Param("detectionStandard")String detectionStandard);
+ List<Map<String, Object>> findDayInspectionStandardProject(@Param("equipmentNum")String equipmentNum,@Param("name")String name,@Param("detectionStandard")String detectionStandard,@Param("dataTime")String dataTime);
/**
* 鐐规鎶ヨ〃 new
*/
- List<Map<String, Object>> getUserQianzi(@Param("num")String num);
+ List<Map<String, Object>> getUserQianzi(@Param("num")String num,@Param("cycleUnit")String cycleUnit);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
index 0bc3dba..66b0ba0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -291,11 +291,10 @@
LEFT JOIN mom_eam_daily_inspection_standard t2 ON t1.daily_inspection_standard_id = t2.id
LEFT JOIN mom_eam_inspection_project t3 ON t1.inspection_project_id = t3.id
LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
- WHERE t4.num = '0524'
+ left join mom_eam_inspection_cycle t5 on t1.inspection_cycle_id = t5.id
+ WHERE t4.num = '0526'
AND t2.version_status = '2'
- UNION ALL select '' as name,'缁存姢璐ｄ换浜虹瀛�' as detectionStandard
- UNION ALL select '' as name,'妫�鏌ヨ矗浠讳汉绛惧瓧' as detectionStandard
-
+ and t5.cycle_unit = #{cycleUnit}
</select>
<select id="findDayInspectionStandardProject" parameterType="String" resultType="Map">
@@ -312,7 +311,17 @@
left join mom_eam_inspection_project t3 on t1.inspection_project_id = t3.id
LEFT JOIN mom_eam_equipment t4 ON t2.equipment_id = t4.id
WHERE
- t4.num = '0524'
+
+ <if test="equipmentNum != null and equipmentNum != ''">
+ t4.num = #{equipmentNum}
+ </if>
+ <if test="equipmentNum == null and equipmentNum == ''"> and t4.num = '-1' </if>
+ <if test="dataTime != null and dataTime != ''">
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )
+ </if>
+ <if test="dataTime == null and dataTime == ''">
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
+ </if>
and t3.name = #{name} and t3.detection_standard = #{detectionStandard}
</select>
@@ -324,7 +333,8 @@
FROM
mom_eam_inspection_order t1
LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_eam_inspection_cycle t3 ON t1.inspection_cycle_id = t3.id
WHERE
- t2.num = '0524'
+ t2.num = '0526' and t3.cycle_unit = #{cycleUnit}
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java
index 910c18b..636435d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IInspectionOrderService.java
@@ -42,14 +42,14 @@
/**
* 鐐规鎶ヨ〃 new
*/
- List<Map<String, Object>> findDayInspectionStandard(String equipmentNum);
+ List<Map<String, Object>> findDayInspectionStandard(String equipmentNum,String cycleUnit);
/**
* 鑾峰彇鐐规椤� new
*/
- List<Map<String, Object>> findDayInspectionStandardProject(String name,String detectionStandard);
+ List<Map<String, Object>> findDayInspectionStandardProject(String equipmentNum,String name,String detectionStandard,String dataTime);
- List<Map<String, Object>> getUserQianZi(String num);
+ List<Map<String, Object>> getUserQianZi(String num,String cycleUnit);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
index 02e2c08..56d5a4a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
@@ -98,20 +98,20 @@
* 鐐规鎶ヨ〃 new
*/
@Override
- public List<Map<String, Object>> findDayInspectionStandard(String equipmentNum) {
- return this.baseMapper.findDayInspectionStandard(equipmentNum);
+ public List<Map<String, Object>> findDayInspectionStandard(String equipmentNum,String cycleUnit) {
+ return this.baseMapper.findDayInspectionStandard(equipmentNum,cycleUnit);
}
/**
* 鑾峰彇鐐规椤� new
*/
@Override
- public List<Map<String, Object>> findDayInspectionStandardProject(String name, String detectionStandard) {
- return this.baseMapper.findDayInspectionStandardProject(name,detectionStandard);
+ public List<Map<String, Object>> findDayInspectionStandardProject(String equipmentNum,String name, String detectionStandard,String dataTime) {
+ return this.baseMapper.findDayInspectionStandardProject(equipmentNum,name,detectionStandard,dataTime);
}
@Override
- public List<Map<String, Object>> getUserQianZi(String num) {
- return this.baseMapper.getUserQianzi(num);
+ public List<Map<String, Object>> getUserQianZi(String num,String cycleUnit) {
+ return this.baseMapper.getUserQianzi(num,cycleUnit);
}
}
--
Gitblit v1.9.3