From 2c250bb7d2c0efd16e5f124648bc77f5fd93040a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 29 十月 2023 22:05:14 +0800
Subject: [PATCH] 增加下次三保时间 技术状态类型及单号
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
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 f0175f1..aade9a6 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
@@ -27,9 +27,7 @@
t4.num as inspectionStandardNum,
t1.create_by as createBy,
t1.create_time as createTime,
- t2.use_id as useId,
t6.depart_name as useDepartName,
- t2.team_id as teamId,
t7.name as teamName,
t4.assign_mode as assignMode,
t8.item_text as assignModeName,
@@ -83,6 +81,7 @@
t1.photo,
t1.inspection_project_id as inspectionProjectId,
t3.num as inspectionProjectNum,
+ t3.name as inspectionProjectName,
t3.detection_standard as detectionStandard,
t3.acceptability_limit AS acceptabilityLimit,
t3.inspection_method as inspectionMethod,
@@ -113,6 +112,7 @@
t1.photo,
t1.inspection_project_id AS inspectionProjectId,
t3.num AS inspectionProjectNum,
+ t3.name as inspectionProjectName,
t3.detection_standard AS detectionStandard,
t3.acceptability_limit AS acceptabilityLimit,
t3.inspection_method AS inspectionMethod,
@@ -132,20 +132,36 @@
</if>
</select>
+<!-- <select id="findUserList" parameterType="Map" resultType="Map">-->
+<!-- SELECT-->
+<!-- t1.id,-->
+<!-- t1.username,-->
+<!-- t1.realname,-->
+<!-- t3.name as teamName-->
+<!-- FROM-->
+<!-- sys_user t1-->
+<!-- LEFT JOIN mom_base_team_class t2 ON t1.team_class_id = t2.id-->
+<!-- left join mom_base_team t3 on t2.team_id = t3.id-->
+<!-- where t1.del_flag = 0 and t2.del_flag = 0 and t3.id = #{params.teamId}-->
+<!-- <if test="params.num!=null and params.num!= ''">-->
+<!-- and t3.num like concat('%',#{params.num},'%')-->
+<!-- </if>-->
+<!-- <if test="params.username!=null and params.username!= ''">-->
+<!-- and t1.username like concat('%',#{params.username},'%')-->
+<!-- </if>-->
+<!-- <if test="params.realname!=null and params.realname!= ''">-->
+<!-- and t1.realname like concat('%',#{params.realname},'%')-->
+<!-- </if>-->
+<!-- ORDER BY t1.create_time desc-->
+<!-- </select>-->
<select id="findUserList" parameterType="Map" resultType="Map">
SELECT
- t1.id,
- t1.username,
- t1.realname,
- t3.name as teamName
+ t1.id,
+ t1.username,
+ t1.realname
FROM
- sys_user t1
- LEFT JOIN mom_base_team_class t2 ON t1.team_class_id = t2.id
- left join mom_base_team t3 on t2.team_id = t3.id
- where t1.del_flag = 0 and t2.del_flag = 0 and t3.id = #{params.teamId}
- <if test="params.num!=null and params.num!= ''">
- and t3.num like concat('%',#{params.num},'%')
- </if>
+ sys_user t1
+ where t1.del_flag = 0
<if test="params.username!=null and params.username!= ''">
and t1.username like concat('%',#{params.username},'%')
</if>
--
Gitblit v1.9.3