From 59bd0ee911d9af6792786ad521e33e393c77d329 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 18 Sep 2024 17:50:14 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisSalesmenRel.java      |  8 +++++
 .../mapper/EmisSalesmenRelMapper.xml          | 34 ++++++++++++++-----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java
index 4e26ef335..6e22adab2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesmenRel.java
@@ -39,5 +39,13 @@ public class EmisSalesmenRel extends BaseEntity
     private String salesmen;
     /* 销售助理 */
     private String salesAss;
+    /* 启用状态 1-启用 0-停用 */
+    private String blOpen;
+    /* 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date startDate;
+    /* 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date endDate;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml
index e7cec3e85..f1a3cda4c 100644
--- a/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSalesmenRelMapper.xml
@@ -8,10 +8,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="salesmen"    column="salesmen"    />
         <result property="salesAss"    column="sales_ass"    />
+        <result property="blOpen"    column="bl_open"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
     </resultMap>
 
     <sql id="selectEmisSalesmenRelVo">
-        select id, salesmen, sales_ass, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_salesmen_rel
+        select id, salesmen, sales_ass, remark, bl_open, start_date, end_date, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_salesmen_rel
     </sql>
 
     <select id="selectEmisSalesmenRelList" parameterType="EmisSalesmenRel" resultMap="EmisSalesmenRelResult">
@@ -29,6 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+
+            <if test="blOpen != null  and blOpen != ''"> and bl_open=#{blOpen}</if>
+
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+
         </where>
         order by create_time desc
     </select>
@@ -51,18 +60,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
   
     <select id="selectEmisSalesmenRelById" parameterType="Long" resultMap="EmisSalesmenRelResult">
-        select id, salesmen, sales_ass, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, salesmen, sales_ass, remark, bl_open, start_date, end_date, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_salesmen_rel a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisSalesmenRel" parameterType="EmisSalesmenRel" useGeneratedKeys="true" keyProperty="id">
         insert into emis_salesmen_rel
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="salesmen != null and salesmen != ''">salesmen,</if>
             <if test="salesAss != null and salesAss != ''">sales_ass,</if>
             <if test="remark != null and remark != ''">remark,</if>
+            <if test="blOpen != null and blOpen != ''">bl_open,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -70,12 +81,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="salesmen != null and salesmen != ''">#{salesmen},</if>
             <if test="salesAss != null and salesAss != ''">#{salesAss},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="blOpen != null and blOpen != ''">#{blOpen},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -83,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisSalesmenRel" parameterType="EmisSalesmenRel">
@@ -92,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
             <if test="salesAss != null and salesAss != ''">sales_ass = #{salesAss},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="blOpen != null and blOpen != ''">bl_open = #{blOpen},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -104,11 +120,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteEmisSalesmenRelById" parameterType="Long">
-        delete from emis_salesmen_rel where id = #{id}
+        update emis_salesmen_rel set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisSalesmenRelByIds" parameterType="String">
-        delete from emis_salesmen_rel where id in 
+        update emis_salesmen_rel set del_flag='1'  where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>