From b79b3b5376bc5a54d897390718ddfee173c4eb32 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期一, 27 十一月 2023 16:51:30 +0800
Subject: [PATCH] 20231127_qiuyh_隐患举报地点调整为下拉
---
hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml
index 8b5841d..76be0eb 100644
--- a/hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml
@@ -29,6 +29,9 @@
<if test="companyId != null">
companyId,
</if>
+ <if test="status != null">
+ `status`,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -55,29 +58,37 @@
<if test="companyId != null">
#{companyId,jdbcType=VARCHAR},
</if>
+ <if test="status != null">
+ #{status,jdbcType=INTEGER},
+ </if>
</trim>
on duplicate key update
- <if test="task != null">
- task = #{task,jdbcType=VARCHAR},
- </if>
- <if test="standard != null">
- standard = #{standard,jdbcType=VARCHAR},
- </if>
- <if test="createUser != null">
- createUser = #{createUser,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- createTime = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="updateUser != null">
- updateUser = #{updateUser,jdbcType=VARCHAR},
- </if>
- <if test="updateTime != null">
- updateTime = #{updateTime,jdbcType=TIMESTAMP},
- </if>
- <if test="companyId != null">
- companyId = #{companyId,jdbcType=VARCHAR},
- </if>
+ <trim suffixOverrides=",">
+ <if test="task != null">
+ task = #{task,jdbcType=VARCHAR},
+ </if>
+ <if test="standard != null">
+ standard = #{standard,jdbcType=VARCHAR},
+ </if>
+ <if test="createUser != null">
+ createUser = #{createUser,jdbcType=VARCHAR},
+ </if>
+ <if test="createTime != null">
+ createTime = #{createTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="updateUser != null">
+ updateUser = #{updateUser,jdbcType=VARCHAR},
+ </if>
+ <if test="updateTime != null">
+ updateTime = #{updateTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="companyId != null">
+ companyId = #{companyId,jdbcType=VARCHAR},
+ </if>
+ <if test="status != null">
+ `status` = #{status,jdbcType=INTEGER},
+ </if>
+ </trim>
</insert>
@@ -97,6 +108,7 @@
t.updateTime,
t.isUse,
t.companyId,
+ t.`status`,
GROUP_CONCAT(DISTINCT b.real_name ORDER BY b.job_num SEPARATOR '、') realNames,
GROUP_CONCAT(DISTINCT b.user_id ORDER BY b.job_num SEPARATOR '、') userIds,
GROUP_CONCAT(DISTINCT d.region ORDER BY c.sort SEPARATOR ',') regions,
--
Gitblit v1.9.3