Skip to content

H
haoban-manage3.0
Commit 6b342a58 by 墨竹
Options

fix：查询门店返回企业名称和corpname修复

parent c249b7d0
Showing with 236 additions and 231 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java
...@@ -9,16 +9,12 @@ public interface WxEnterpriseRelatedMapper { ...@@ -9,16 +9,12 @@ public interface WxEnterpriseRelatedMapper {
int deleteByPrimaryKey(String wxEnterpriseRelatedId); int deleteByPrimaryKey(String wxEnterpriseRelatedId);
int insert(TabHaobanWxEnterpriseRelated record);
int insertSelective(TabHaobanWxEnterpriseRelated record); int insertSelective(TabHaobanWxEnterpriseRelated record);
TabHaobanWxEnterpriseRelated selectByPrimaryKey(String wxEnterpriseRelatedId); TabHaobanWxEnterpriseRelated selectByPrimaryKey(String wxEnterpriseRelatedId);
int updateByPrimaryKeySelective(TabHaobanWxEnterpriseRelated record); int updateByPrimaryKeySelective(TabHaobanWxEnterpriseRelated record);
int updateByPrimaryKey(TabHaobanWxEnterpriseRelated record);
List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId); List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId);
@Deprecated @Deprecated
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxEnterpriseRelated.java
...@@ -9,6 +9,8 @@ public class TabHaobanWxEnterpriseRelated implements Serializable { ...@@ -9,6 +9,8 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
private String wxEnterpriseId; private String wxEnterpriseId;
private String enterpriseId; private String enterpriseId;
private String enterpriseName;
private String version; private String version;
...@@ -135,6 +137,12 @@ public class TabHaobanWxEnterpriseRelated implements Serializable { ...@@ -135,6 +137,12 @@ public class TabHaobanWxEnterpriseRelated implements Serializable {
public void setStaffName(String staffName) { public void setStaffName(String staffName) {
this.staffName = staffName; this.staffName = staffName;
} }
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
} }
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper" > <mapper namespace="com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper">
<resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" > <resultMap id="BaseResultMap" type="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated">
<id column="wx_enterprise_related_id" property="wxEnterpriseRelatedId" jdbcType="VARCHAR" /> <id column="wx_enterprise_related_id" property="wxEnterpriseRelatedId" jdbcType="VARCHAR"/>
<result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR" /> <result column="wx_enterprise_id" property="wxEnterpriseId" jdbcType="VARCHAR"/>
<result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR" /> <result column="enterprise_id" property="enterpriseId" jdbcType="VARCHAR"/>
<result column="version" property="version" jdbcType="VARCHAR" /> <result column="enterprise_name" property="enterpriseName" jdbcType="VARCHAR"/>
<result column="staff_id" property="staffId" jdbcType="VARCHAR" /> <result column="version" property="version" jdbcType="VARCHAR"/>
<result column="staff_name" property="staffName" jdbcType="VARCHAR" /> <result column="staff_id" property="staffId" jdbcType="VARCHAR"/>
<result column="status_flag" property="statusFlag" jdbcType="INTEGER" /> <result column="staff_name" property="staffName" jdbcType="VARCHAR"/>
<result column="wx_enterprise_type" property="wxEnterpriseType" jdbcType="INTEGER"/> <result column="status_flag" property="statusFlag" jdbcType="INTEGER"/>
<result column="member_open_card_flag" property="memberOpenCardFlag" jdbcType="INTEGER"/> <result column="wx_enterprise_type" property="wxEnterpriseType" jdbcType="INTEGER"/>
<result column="clerk_edit_flag" property="clerkEditFlag" jdbcType="INTEGER"/> <result column="member_open_card_flag" property="memberOpenCardFlag" jdbcType="INTEGER"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> <result column="clerk_edit_flag" property="clerkEditFlag" jdbcType="INTEGER"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
</resultMap> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<sql id="Base_Column_List" > </resultMap>
wx_enterprise_related_id, wx_enterprise_id, enterprise_id, version, status_flag, wx_enterprise_type, <sql id="Base_Column_List">
wx_enterprise_related_id, wx_enterprise_id, enterprise_id, enterprise_name,version, status_flag, wx_enterprise_type,
member_open_card_flag,clerk_edit_flag, member_open_card_flag,clerk_edit_flag,
create_time, update_time,staff_id,staff_name create_time, update_time,staff_id,staff_name
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related from tab_haoban_wx_enterprise_related
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR} where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" > <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_wx_enterprise_related delete
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR} from tab_haoban_wx_enterprise_related
</delete> where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" > </delete>
insert into tab_haoban_wx_enterprise_related (wx_enterprise_related_id, wx_enterprise_id,
enterprise_id, version, status_flag, <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated">
create_time, update_time,staff_id,staff_name) insert into tab_haoban_wx_enterprise_related
values (#{wxEnterpriseRelatedId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, <trim prefix="(" suffix=")" suffixOverrides=",">
#{enterpriseId,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, <if test="wxEnterpriseRelatedId != null">
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{staffId},#{staffName}) wx_enterprise_related_id,
</insert> </if>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" > <if test="wxEnterpriseId != null">
insert into tab_haoban_wx_enterprise_related wx_enterprise_id,
<trim prefix="(" suffix=")" suffixOverrides="," > </if>
<if test="wxEnterpriseRelatedId != null" > <if test="enterpriseId != null">
wx_enterprise_related_id, enterprise_id,
</if> </if>
<if test="wxEnterpriseId != null" > <if test="enterpriseName != null">
wx_enterprise_id, enterprise_name,
</if> </if>
<if test="enterpriseId != null" > <if test="version != null">
enterprise_id, version,
</if> </if>
<if test="version != null" > <if test="statusFlag != null">
version, status_flag,
</if> </if>
<if test="statusFlag != null" > <if test="wxEnterpriseType != null">
status_flag, wx_enterprise_type,
</if> </if>
<if test="wxEnterpriseType != null"> <if test="memberOpenCardFlag != null">
wx_enterprise_type, member_open_card_flag,
</if> </if>
<if test="memberOpenCardFlag != null"> <if test="clerkEditFlag != null">
member_open_card_flag, clerk_edit_flag,
</if> </if>
<if test="clerkEditFlag != null"> <if test="createTime != null">
clerk_edit_flag, create_time,
</if> </if>
<if test="createTime != null" > <if test="updateTime != null">
create_time, update_time,
</if> </if>
<if test="updateTime != null" > <if test="staffId != null">
update_time, staff_id,
</if> </if>
<if test="staffId != null" > <if test="staffName != null">
staff_id, staff_name,
</if> </if>
<if test="staffName != null" > </trim>
staff_name, <trim prefix="values (" suffix=")" suffixOverrides=",">
</if> <if test="wxEnterpriseRelatedId != null">
</trim> #{wxEnterpriseRelatedId,jdbcType=VARCHAR},
<trim prefix="values (" suffix=")" suffixOverrides="," > </if>
<if test="wxEnterpriseRelatedId != null" > <if test="wxEnterpriseId != null">
#{wxEnterpriseRelatedId,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="wxEnterpriseId != null" > <if test="enterpriseId != null">
#{wxEnterpriseId,jdbcType=VARCHAR}, #{enterpriseId,jdbcType=VARCHAR},
</if> </if>
<if test="enterpriseId != null" > <if test="enterpriseName != null">
#{enterpriseId,jdbcType=VARCHAR}, #{enterpriseName},
</if> </if>
<if test="version != null" > <if test="version != null">
#{version,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR},
</if> </if>
<if test="statusFlag != null" > <if test="statusFlag != null">
#{statusFlag,jdbcType=INTEGER}, #{statusFlag,jdbcType=INTEGER},
</if> </if>
<if test="wxEnterpriseType != null"> <if test="wxEnterpriseType != null">
#{wxEnterpriseType,jdbcType=INTEGER}, #{wxEnterpriseType,jdbcType=INTEGER},
</if> </if>
<if test="memberOpenCardFlag != null"> <if test="memberOpenCardFlag != null">
#{memberOpenCardFlag,jdbcType=INTEGER}, #{memberOpenCardFlag,jdbcType=INTEGER},
</if>
<if test="clerkEditFlag != null">
#{clerkEditFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffId != null">
#{staffId},
</if>
<if test="staffName != null">
#{staffName},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective"
parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated">
update tab_haoban_wx_enterprise_related
<set>
<if test="wxEnterpriseId != null">
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="enterpriseName != null">
enterprise_name = #{enterpriseName},
</if>
<if test="version != null">
version = #{version,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null">
status_flag = #{statusFlag,jdbcType=INTEGER},
</if>
<if test="rangeType != null">
range_type = #{rangeType,jdbcType=INTEGER},
</if>
<if test="memberOpenCardFlag != null">
member_open_card_flag = #{memberOpenCardFlag,jdbcType=INTEGER},
</if>
<if test="clerkEditFlag != null">
clerk_edit_flag = #{clerkEditFlag,jdbcType=INTEGER},
</if>
<if test="wxEnterpriseType != null">
wx_enterprise_type = #{wxEnterpriseType,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffId != null">
staff_id = #{staffId,jdbcType=VARCHAR},
</if>
<if test="staffName != null">
staff_name = #{staffName,jdbcType=VARCHAR},
</if>
</set>
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</update>
<select id="listByWxenterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="findOneByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="queryAllHasGicEnterpriseId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where status_flag = 1
</select>
<select id="listEnterpriseByEnterpriseIds" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where status_flag = 1
<if test="enterpriseIds != null and enterpriseIds.size() > 0">
and enterprise_id IN
<foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR}
</foreach>
</if> </if>
<if test="clerkEditFlag != null"> </select>
#{clerkEditFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null" >
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffId != null" >
#{staffId},
</if>
<if test="staffName != null" >
#{staffName},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
update tab_haoban_wx_enterprise_related
<set >
<if test="wxEnterpriseId != null" >
wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null" >
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
</if>
<if test="version != null" >
version = #{version,jdbcType=VARCHAR},
</if>
<if test="statusFlag != null" >
status_flag = #{statusFlag,jdbcType=INTEGER},
</if>
<if test="rangeType != null">
range_type = #{rangeType,jdbcType=INTEGER},
</if>
<if test="memberOpenCardFlag != null">
member_open_card_flag = #{memberOpenCardFlag,jdbcType=INTEGER},
</if>
<if test="clerkEditFlag != null">
clerk_edit_flag = #{clerkEditFlag,jdbcType=INTEGER},
</if>
<if test="wxEnterpriseType != null">
wx_enterprise_type = #{wxEnterpriseType,jdbcType=INTEGER},
</if>
<if test="createTime != null" >
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null" >
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="staffId != null" >
staff_id = #{staffId,jdbcType=VARCHAR},
</if>
<if test="staffName != null" >
staff_name = #{staffName,jdbcType=VARCHAR},
</if>
</set>
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated" >
update tab_haoban_wx_enterprise_related
set wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=VARCHAR},
version = #{version,jdbcType=VARCHAR},
status_flag = #{statusFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
staff_id = #{staffId,jdbcType=VARCHAR},
staff_name = #{staffName,jdbcType=VARCHAR},
where wx_enterprise_related_id = #{wxEnterpriseRelatedId,jdbcType=VARCHAR}
</update>
<select id="listByWxenterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_wx_enterprise_related
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="findOneByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
from tab_haoban_wx_enterprise_related
where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="queryAllHasGicEnterpriseId" resultMap="BaseResultMap" >
select
<include refid="Base_Column_List" />
from tab_haoban_wx_enterprise_related
where status_flag = 1
</select>
<select id="listEnterpriseByEnterpriseIds" resultMap="BaseResultMap" >
select
<include refid="Base_Column_List" />
from tab_haoban_wx_enterprise_related
where status_flag = 1
<if test="enterpriseIds != null and enterpriseIds.size() > 0">
and enterprise_id IN
<foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR}
</foreach>
</if>
</select>
<select id="listEnterpriseByTime" resultMap="BaseResultMap" > <select id="listEnterpriseByTime" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related from tab_haoban_wx_enterprise_related
where status_flag = 1 where status_flag = 1
AND DATE_FORMAT(update_time,'%Y-%m-%d') = #{time} AND DATE_FORMAT(update_time,'%Y-%m-%d') = #{time}
</select> </select>
<select id="findOneByEIdAndWxEid" resultMap="BaseResultMap"> <select id="findOneByEIdAndWxEid" resultMap="BaseResultMap">
select select
...@@ -221,19 +216,18 @@ ...@@ -221,19 +216,18 @@
and status_flag = 1 and wx_enterprise_id=#{wxEnterpriseId} and status_flag = 1 and wx_enterprise_id=#{wxEnterpriseId}
</select> </select>
<select id="findRootWxEnterpriseByEnterpriseId" resultMap="BaseResultMap"> <select id="findRootWxEnterpriseByEnterpriseId" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related from tab_haoban_wx_enterprise_related
where enterprise_id = #{enterpriseId,jdbcType=VARCHAR} where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
and status_flag = 1 and status_flag = 1
and wx_enterprise_type = 0 and wx_enterprise_type = 0
</select> </select>
<select id="findAllEnterpriseId" resultType="java.lang.String"> <select id="findAllEnterpriseId" resultType="java.lang.String">
select select distinct enterprise_id
distinct enterprise_id from tab_haoban_wx_enterprise_related
from tab_haoban_wx_enterprise_related where status_flag = 1
where status_flag = 1 </select>
</select>
</mapper> </mapper>
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
...@@ -119,12 +119,17 @@ public class StoreController extends WebBaseController { ...@@ -119,12 +119,17 @@ public class StoreController extends WebBaseController {
if (wxEnterpriseDTO == null) { if (wxEnterpriseDTO == null) {
continue; continue;
} }
String enterpriseId = clerk.getEnterpriseId();
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
if (enterpriseDTO == null) {
continue;
}
//主门店标志 //主门店标志
int mainStoreFlag = 0; int mainStoreFlag = 0;
if (storeId.equals(store.getStoreId())) { if (storeId.equals(store.getStoreId())) {
mainStoreFlag = 1; mainStoreFlag = 1;
} }
EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(clerk.getEnterpriseId()); EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(enterpriseId);
staffDepartmentRelatedApiService.listByStaffId(staffId); staffDepartmentRelatedApiService.listByStaffId(staffId);
StaffStoreVO vo = new StaffStoreVO(); StaffStoreVO vo = new StaffStoreVO();
vo.setClerkCode(clerk.getClerkCode()); vo.setClerkCode(clerk.getClerkCode());
...@@ -132,7 +137,7 @@ public class StoreController extends WebBaseController { ...@@ -132,7 +137,7 @@ public class StoreController extends WebBaseController {
vo.setMemberOpenCardFlag(enterpriseDetailDTO != null ? enterpriseDetailDTO.getMemberOpenCardFlag() : null); vo.setMemberOpenCardFlag(enterpriseDetailDTO != null ? enterpriseDetailDTO.getMemberOpenCardFlag() : null);
vo.setClerkId(clerk.getClerkId()); vo.setClerkId(clerk.getClerkId());
vo.setClerkType(clerk.getClerkType()); vo.setClerkType(clerk.getClerkType());
vo.setEnterpriseId(clerk.getEnterpriseId()); vo.setEnterpriseId(enterpriseId);
vo.setMainStoreFlag(mainStoreFlag); vo.setMainStoreFlag(mainStoreFlag);
vo.setPhoneNumber(clerk.getPhoneNumber()); vo.setPhoneNumber(clerk.getPhoneNumber());
vo.setStaffId(staffId); vo.setStaffId(staffId);
...@@ -143,7 +148,7 @@ public class StoreController extends WebBaseController { ...@@ -143,7 +148,7 @@ public class StoreController extends WebBaseController {
vo.setClerkName(clerk.getClerkName()); vo.setClerkName(clerk.getClerkName());
vo.setHeadImg(staffDTO.getHeadImg()); vo.setHeadImg(staffDTO.getHeadImg());
vo.setBindFlag(1); vo.setBindFlag(1);
vo.setEnterpriseName(enterpriseDetailDTO != null ? enterpriseDetailDTO.getEnterpriseName() : null); vo.setEnterpriseName(enterpriseDTO.getEnterpriseName());
vo.setCorpName(wxEnterpriseDTO.getCorpName()); vo.setCorpName(wxEnterpriseDTO.getCorpName());
list.add(vo); list.add(vo);
} }
......
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