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"
+
+
+
- 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
@@ -51,18 +60,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
insert into emis_salesmen_rel
- id,
salesmen,
sales_ass,
remark,
+ bl_open,
+ start_date,
+ end_date,
del_flag,
create_by,
create_time,
@@ -70,12 +81,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
create_site,
update_site,
-
+
- #{id},
#{salesmen},
#{salesAss},
#{remark},
+ #{blOpen},
+ #{startDate},
+ #{endDate},
#{delFlag},
#{createBy},
#{createTime},
@@ -83,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateTime},
#{createSite},
#{updateSite},
-
+
@@ -92,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
salesmen = #{salesmen},
sales_ass = #{salesAss},
remark = #{remark},
+ bl_open = #{blOpen},
+ start_date = #{startDate},
+ end_date = #{endDate},
del_flag = #{delFlag},
create_by = #{createBy},
create_time = #{createTime},
@@ -104,11 +120,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from emis_salesmen_rel where id = #{id}
+ update emis_salesmen_rel set del_flag='1' where id = #{id}
- delete from emis_salesmen_rel where id in
+ update emis_salesmen_rel set del_flag='1' where id in
#{id}