From 0271719bce3d6be197eab2e143e478dbf010b8a8 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 04 Sep 2024 10:53:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
index b5242a3..00e5dba 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUnitMapper.xml
@@ -46,6 +46,12 @@
<result property="custId" column="cust_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="postalCode" column="postal_code"/>
+ <result property="telephone" column="telephone"/>
+ <result property="workTimeWeek" column="work_time_week"/>
+ <result property="workTimeAm" column="work_time_am"/>
+ <result property="workTimePm" column="work_time_pm"/>
+
</resultMap>
<!-- 表 -->
<sql id='table-name'>dyh_ct_unit</sql>
@@ -85,7 +91,12 @@
delete_status,
cust_id,
create_time,
- update_time
+ update_time,
+ postal_code,
+ telephone,
+ work_time_week,
+ work_time_am,
+ work_time_pm
</sql>
<!-- 更新实体字段 -->
<sql id="set-part">
@@ -122,12 +133,22 @@
<if test="entity.deleteStatus != null">delete_status = #{entity.deleteStatus},</if>
<if test="entity.custId != null">cust_id = #{entity.custId},</if>
<if test="entity.createTime != null">create_time = #{entity.createTime},</if>
- <if test="entity.updateTime != null">update_time = #{entity.updateTime}</if>
+ <if test="entity.updateTime != null">update_time = #{entity.updateTime},</if>
+ <if test="entity.postalCode != null">postal_code = #{entity.postalCode},</if>
+ <if test="entity.telephone != null">telephone = #{entity.telephone},</if>
+ <if test="entity.workTimeWeek != null">work_time_week = #{entity.workTimeWeek},</if>
+ <if test="entity.workTimeAm != null">work_time_am = #{entity.workTimeAm},</if>
+ <if test="entity.workTimePm != null">work_time_pm = #{entity.workTimePm},</if>
+
+
</sql>
<!-- 条件 -->
<sql id="where-part">
<if test="terms != null">
<where>
+ <if test="terms.keyword != null and terms.keyword !=''">
+ and unit_name like CONCAT('%', #{terms.keyword}, '%')
+ </if>
<if test="terms.id != null and terms.id !=''">
and id = #{terms.id}
</if>
@@ -146,6 +167,12 @@
<if test="terms.unitType != null and terms.unitType !=''">
and unit_type = #{terms.unitType}
</if>
+ <if test="terms.unitTypes != null and terms.unitTypes.size > 0 ">
+ and unit_type in
+ <foreach item="unitType" collection="terms.unitTypes" separator="," open="(" close=")" index="">
+ #{unitType}
+ </foreach>
+ </if>
<if test="terms.unitCode != null and terms.unitCode !=''">
and unit_code = #{terms.unitCode}
</if>
--
Gitblit v1.8.0