From 05c50d1f3ccddeffe8d1b5be173d01e553b6d01e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:59:42 +0800
Subject: [PATCH] 时间条件修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 10 ++++++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 13 ++++++++++++-
2 files changed, 20 insertions(+), 3 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 02cbbb6..2dd2fa7 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
@@ -93,6 +93,10 @@
@Lazy
private IDailyInspectionStandardService dailyInspectionStandardService;
+ @Autowired
+ @Lazy
+ private IAreaService areaService;
+
// @Autowired
// private IUploadRelaService uploadRelaService;
//
@@ -710,6 +714,10 @@
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 workCenterId = equipment.getWorkCenterId();
+
+ Area area = areaService.getById(workCenterId);
+
List<Map<String, Object>> list1 = this.getInspectionStandars(equipmentNum,"day",dataTime);
List<Map<String, Object>> list2 = this.getUserQianzi(equipmentNum,"day",dataTime);
@@ -720,6 +728,10 @@
mapResult.put("equipentNum",equipment.getNum());
mapResult.put("equipentName",equipment.getName());
+ mapResult.put("equipmentModel",equipment.getModel());
+ if(area != null){
+ mapResult.put("workCenterName",area.getName());
+ }
mapResult.put("list1",list1);
mapResult.put("list2",list2);
mapResult.put("list3",list3);
@@ -737,7 +749,6 @@
String name = (String)map.get("name");
String detectionStandard = (String)map.get("detectionStandard");
List<Map<String, Object>> record = inspectionOrderService.findDayInspectionStandardProject(equipmentNum,name, detectionStandard,dataTime);
-
List<InspectionResultVo> listS = new ArrayList<>();
for (Map<String, Object> r : record) {
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 3bd99b9..794eca5 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
@@ -326,13 +326,16 @@
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 )
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = #{dataTime}
</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>
+<!-- <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>-->
<select id="getUserQianzi" parameterType="String" resultType="Map">
SELECT
@@ -351,11 +354,14 @@
and t2.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 )
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = #{dataTime}
</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.cycle_unit = #{cycleUnit}
</select>
+<!-- <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>-->
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3