Skip to content

H
haoban-manage3.0
Commit 048665f8 by 墨竹
Options

feat：新增字段

parent 5136907d
Showing with 117 additions and 10 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmClerkRelationQDTO.java
......@@ -47,6 +47,9 @@ public class HmClerkRelationQDTO implements Serializable {
*/
private Integer overFlag;
private String staffId;
private String staffName;
public Long getRelationId() {
return relationId;
......@@ -168,5 +171,20 @@ public class HmClerkRelationQDTO implements Serializable {
this.overFlag = overFlag;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmQrcodeQDTO.java
......@@ -94,6 +94,8 @@ public class HmQrcodeQDTO implements Serializable {
* 导购id列表
*/
private List<String> clerkIdList;
private String staffId;
private String staffName;
public Long getHmId() {
......@@ -335,5 +337,21 @@ public class HmQrcodeQDTO implements Serializable {
public void setClerkIdList(List<String> clerkIdList) {
this.clerkIdList = clerkIdList;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmClerkRelation.java
......@@ -47,6 +47,8 @@ public class TabHaobanHmClerkRelation implements Serializable {
private Integer overFlag;
private Integer addNum;
private String staffId;
private String staffName;
public Long getRelationId() {
......@@ -176,5 +178,21 @@ public class TabHaobanHmClerkRelation implements Serializable {
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHaobanHmQrcode.java
......@@ -89,6 +89,8 @@ public class TabHaobanHmQrcode implements Serializable {
* 活码分组
*/
private Long hmGroupId;
private String staffId;
private String staffName;
public Long getHmId() {
......@@ -323,5 +325,20 @@ public class TabHaobanHmQrcode implements Serializable {
this.hmGroupId = hmGroupId;
}
public String getStaffId() {
return staffId;
}
public void setStaffId(String staffId) {
this.staffId = staffId;
}
public String getStaffName() {
return staffName;
}
public void setStaffName(String staffName) {
this.staffName = staffName;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
......@@ -18,6 +18,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.service.config.Config;
import com.gic.haoban.manage.service.entity.TabHaobanStaff;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
......@@ -177,6 +178,14 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmQrcodeQDTO.setClerkName(clerkDTO.getClerkName());
hmQrcodeQDTO.setClerkCode(clerkDTO.getClerkCode());
}
StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
if (staffClerkRelationDTO != null) {
hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
if (tabHaobanStaff != null) {
hmQrcodeQDTO.setStaffName(tabHaobanStaff.getStaffName());
}
}
}
return clerkIdList;
}
......@@ -208,6 +217,15 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
hmClerkRelationQDTO.setClerkName(clerkDTO.getClerkName());
hmClerkRelationQDTO.setClerkCode(clerkDTO.getClerkCode());
}
StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
if (staffClerkRelationDTO != null) {
hmClerkRelationQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
TabHaobanStaff tabHaobanStaff = staffService.selectById(staffClerkRelationDTO.getStaffId());
if (tabHaobanStaff != null) {
hmClerkRelationQDTO.setStaffName(tabHaobanStaff.getStaffName());
}
}
clerkRelationQDTOS.add(hmClerkRelationQDTO);
}
hmClerkRelationService.insertBatch(clerkRelationQDTOS);
......
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmClerkRelationMapper.xml
......@@ -19,12 +19,14 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="overFlag" column="over_flag" jdbcType="INTEGER"/>
<result property="addNum" column="add_num" jdbcType="INTEGER"/>
<result property="staffId" column="staff_id" jdbcType="VARCHAR"/>
<result property="staffName" column="staff_name" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
hm_id, wx_user_id, wx_enterprise_id, enterprise_id, store_id,
store_name, store_code, clerk_id, clerk_name, clerk_code, status,
create_time, update_time, over_flag, add_num
create_time, update_time, over_flag, add_num,staff_id,staff_name
</sql>
<!--查询单个-->
......@@ -38,19 +40,20 @@
<insert id="insert" keyProperty="relationId" useGeneratedKeys="true">
insert into tab_haoban_hm_clerk_relation(hm_id, wx_user_id, wx_enterprise_id, enterprise_id, store_id,
store_name, store_code, clerk_id, clerk_name, clerk_code, status,
create_time, update_time, over_flag, add_num)
create_time, update_time, over_flag, add_num,staff_id,staff_name)
values (#{hmId}, #{wxUserId}, #{wxEnterpriseId}, #{enterpriseId}, #{storeId}, #{storeName}, #{storeCode},
#{clerkId}, #{clerkName}, #{clerkCode}, #{status}, #{createTime}, #{updateTime}, #{overFlag}, #{addNum})
#{clerkId}, #{clerkName}, #{clerkCode}, #{status}, #{createTime}, #{updateTime}, #{overFlag}, #{addNum},#{staffId},#{staffName})
</insert>
<insert id="insertBatch" keyProperty="relationId" useGeneratedKeys="true">
insert into tab_haoban_hm_clerk_relation(hm_id, wx_user_id, wx_enterprise_id, enterprise_id, store_id,
store_name, store_code, clerk_id, clerk_name, clerk_code, status, create_time, update_time, over_flag,add_num)
store_name, store_code, clerk_id, clerk_name, clerk_code, status, create_time, update_time, over_flag,add_num,staff_id,staff_name)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.hmId}, #{entity.wxUserId}, #{entity.wxEnterpriseId}, #{entity.enterpriseId}, #{entity.storeId},
#{entity.storeName}, #{entity.storeCode}, #{entity.clerkId}, #{entity.clerkName}, #{entity.clerkCode},
#{entity.status}, #{entity.createTime}, #{entity.updateTime}, #{entity.overFlag},#{entity.addNum})
#{entity.status}, #{entity.createTime}, #{entity.updateTime}, #{entity.overFlag},#{entity.addNum},
#{entity.staffId},#{entity.staffName})
</foreach>
</insert>
......@@ -103,6 +106,12 @@
<if test="addNum != null">
add_num = #{addNum},
</if>
<if test="staffId != null">
staff_id = #{staffId},
</if>
<if test="staffName != null">
staff_name = #{staffName},
</if>
</set>
where relation_id = #{relationId}
</update>
......
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml
......@@ -32,6 +32,8 @@
<result property="clerkCode" column="clerk_code" jdbcType="VARCHAR"/>
<result property="hmUserNum" column="hm_user_num" jdbcType="INTEGER"/>
<result property="hmGroupId" column="hm_group_id" jdbcType="INTEGER"/>
<result property="staffId" column="staff_id" jdbcType="VARCHAR"/>
<result property="staffName" column="staff_name" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
......@@ -39,7 +41,7 @@
creator_name, modifier_id, modifier_name, create_time, update_time,
member_label_id, pass_flag, welcome_id, status_flag, add_num, over_flag,
wx_config_id, wx_qrcode, wx_user_id, store_id, store_name, store_code,
clerk_id, clerk_name, clerk_code, hm_user_num, hm_group_id
clerk_id, clerk_name, clerk_code, hm_user_num, hm_group_id,staff_id,staff_name
</sql>
<!--查询单个-->
......@@ -110,20 +112,20 @@
creator_name, modifier_id, modifier_name, create_time, update_time,
member_label_id, pass_flag, welcome_id, status_flag, add_num, over_flag,
wx_config_id, wx_qrcode, wx_user_id, store_id, store_name, store_code,
clerk_id, clerk_name, clerk_code, hm_user_num, hm_group_id)
clerk_id, clerk_name, clerk_code, hm_user_num, hm_group_id,staff_id,staff_name)
values (#{hmId}, #{hmCode}, #{hmType}, #{wxEnterpriseId}, #{enterpriseId}, #{name}, #{creatorId},
#{creatorName},
#{modifierId}, #{modifierName}, #{createTime}, #{updateTime}, #{memberLabelId}, #{passFlag},
#{welcomeId}, #{statusFlag}, #{addNum}, #{overFlag}, #{wxConfigId}, #{wxQrcode}, #{wxUserId},
#{storeId}, #{storeName}, #{storeCode}, #{clerkId}, #{clerkName}, #{clerkCode}, #{hmUserNum},
#{hmGroupId})
#{hmGroupId},#{staffId},#{staffName})
</insert>
<insert id="insertBatch" keyProperty="hmId" useGeneratedKeys="true">
insert into tab_haoban_hm_qrcode(hm_id,hm_code, hm_type, wx_enterprise_id, enterprise_id, name, creator_id,
creator_name, modifier_id, modifier_name, create_time, update_time, member_label_id, pass_flag, welcome_id,
status_flag, add_num, over_flag, wx_config_id, wx_qrcode, wx_user_id, store_id, store_name, store_code,
clerk_id, clerk_name, clerk_code, hm_user_num, hm_group_id)
clerk_id, clerk_name, clerk_code, hm_user_num, hm_group_id,staff_id,staff_name)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.hmId},#{entity.hmCode}, #{entity.hmType}, #{entity.wxEnterpriseId}, #{entity.enterpriseId},
......@@ -132,7 +134,8 @@
#{entity.createTime}, #{entity.updateTime}, #{entity.memberLabelId}, #{entity.passFlag},
#{entity.welcomeId}, #{entity.statusFlag}, #{entity.addNum}, #{entity.overFlag}, #{entity.wxConfigId},
#{entity.wxQrcode}, #{entity.wxUserId}, #{entity.storeId}, #{entity.storeName}, #{entity.storeCode},
#{entity.clerkId}, #{entity.clerkName}, #{entity.clerkCode}, #{entity.hmUserNum}, #{entity.hmGroupId})
#{entity.clerkId}, #{entity.clerkName}, #{entity.clerkCode}, #{entity.hmUserNum}, #{entity.hmGroupId},
#{entity.staffId},#{entity.staffName})
</foreach>
</insert>
......@@ -225,6 +228,12 @@
<if test="hmGroupId != null">
hm_group_id = #{hmGroupId},
</if>
<if test="staffId != null">
staff_id = #{staffId},
</if>
<if test="staffName != null">
staff_name = #{staffName},
</if>
</set>
where hm_id = #{hmId}
</update>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment