suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
苏竹红
2023-06-19 20:06:44 +08:00
parent 0bd2f2b96a 1f982674a4
commit 34b72620ef
63 changed files with 941 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
View File

@@ -64,4 +64,23 @@ public class EnterpriseUserDAO {
public List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(List<String> regionIds, String keyword, boolean isLeader){
return enterpriseUserMapper.searchUserByRegionIdsAndKeyword(regionIds, keyword, isLeader);
}
public boolean isExistDeptUser(String regionId){
if(StringUtils.isBlank(regionId)){
return false;
}
return enterpriseUserMapper.getUserCountByRegionId(regionId) > CommonConstants.ZERO;
}
/**
* 获取部门负责人
* @param regionId
* @return
*/
public List<EnterpriseUserDO> getUserListByDeptLeader(String regionId){
if(StringUtils.isBlank(regionId)){
return Lists.newArrayList();
}
return enterpriseUserMapper.getUserListByDeptLeader(regionId);
}
}

14
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevZoneInfoDAO.java
View File

@@ -5,6 +5,8 @@ import com.cool.store.entity.HyOpenAreaInfoDO;
import com.cool.store.mapper.HyIntendDevZoneInfoMapper;
import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -48,4 +50,16 @@ public class HyIntendDevZoneInfoDAO {
return hyIntendDevZoneInfoMapper.getHyIntendDevZoneInfoList(type);
}
/**
* 根据组织架构获取配置信息
* @param regionIds
* @return
*/
public List<HyIntendDevZoneInfoDO> getZoneInfoByRegionIds(List<String> regionIds){
if(CollectionUtils.isEmpty(regionIds)){
return Lists.newArrayList();
}
return hyIntendDevZoneInfoMapper.getZoneInfoByRegionIds(regionIds);
}
}

12
coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDAO.java
View File

@@ -96,4 +96,16 @@ public class RegionDAO {
return regionMapper.deleteRegionByRegionId(regionId);
}
/**
* 获取所有的子节点
* @param leadDeptIds
*/
public List<String> getSubRegionIds(List<String> leadDeptIds) {
if(CollectionUtils.isEmpty(leadDeptIds)){
return Lists.newArrayList();
}
List<RegionDO> regionList = getRegionByRegionIds(leadDeptIds);
List<String> regionPathList = regionList.stream().map(RegionDO::getRegionPath).collect(Collectors.toList());
return regionMapper.getSubRegionIds(regionPathList);
}
}

12
coolstore-partner-dao/src/main/java/com/cool/store/dao/UserRegionMappingDAO.java
View File

@@ -84,4 +84,16 @@ public class UserRegionMappingDAO {
return userRegionMappingMapper.getRegionIdsByUserId(userId);
}
/**
* 获取用户列表
* @param regionIds
* @return
*/
public List<String> getUserListByRegionIds(List<String> regionIds){
if(CollectionUtils.isEmpty(regionIds)){
return Lists.newArrayList();
}
return userRegionMappingMapper.getUserListByRegionIds(regionIds);
}
}

16
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
View File

@@ -61,4 +61,20 @@ public interface EnterpriseUserMapper {
* @return
*/
List<EnterpriseUserDO> searchUserByRegionIdsAndKeyword(@Param("regionIds") List<String> regionIds, @Param("keyword") String keyword, @Param("isLeader") boolean isLeader);
/**
* 获取部门用户数
* @param regionId
* @return
*/
Integer getUserCountByRegionId(@Param("regionId") String regionId);
/**
* 获取部门负责人用户列表
* @param regionId
* @return
*/
List<EnterpriseUserDO> getUserListByDeptLeader(String regionId);
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java
View File

@@ -39,4 +39,11 @@ public interface HyIntendDevZoneInfoMapper {
* @return
*/
List<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type);
/**
* 根据组织架构获取配置信息
* @param regionIds
* @return
*/
List<HyIntendDevZoneInfoDO> getZoneInfoByRegionIds(@Param("regionIds") List<String> regionIds);
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java
View File

@@ -22,4 +22,11 @@ public interface HyPartnerCertificationInfoMapper {
* dateTime:2023-05-29 03:51
*/
int updateByPrimaryKeySelective(@Param("record") HyPartnerCertificationInfoDO record);
/**
* 根据资质审核流程 id 获取面试会议 id
* @param qualifyVerifyId 资质审核流程 id
* @return 面试会议 id
*/
String getInterviewIdByQualifyVerifyId(@Param("qualifyVerifyId") String qualifyVerifyId);
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
View File

@@ -79,4 +79,11 @@ public interface HyPartnerInterviewMapper {
* 根据面试 id 查询面试信息
*/
HyPartnerInterviewDO selectByPrimaryKeySelective(String interviewId);
/**
* 根据面试 id 获取意向区域
* @param interviewId
* @return
*/
String getVerifyCityByInterviewId(@Param("interviewId") String interviewId);
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
View File

@@ -84,7 +84,7 @@ public interface HyPartnerInterviewPlanMapper {
/**
* 查询面试详情
*
* @param interviewId
* @param interviewPlanId
* @return
*/
InterviewVO getInterviewInfo(String interviewPlanId);

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
View File

@@ -71,4 +71,11 @@ public interface RegionMapper {
* @return
*/
Integer deleteRegionByRegionId(@Param("regionId") String regionId);
/**
* 获取子节点
* @param regionPathList
* @return
*/
List<String> getSubRegionIds(@Param("regionPathList") List<String> regionPathList);
}

7
coolstore-partner-dao/src/main/java/com/cool/store/mapper/UserRegionMappingMapper.java
View File

@@ -68,4 +68,11 @@ public interface UserRegionMappingMapper {
* @return
*/
List<String> getRegionIdsByUserId(@Param("userId") String userId);
/**
* 获取用户列表
* @param regionIds
* @return
*/
List<String> getUserListByRegionIds(@Param("regionIds") List<String> regionIds);
}

8
coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
View File

@@ -280,4 +280,12 @@
</if>
</where>
</select>
<select id="getUserCountByRegionId" resultType="integer">
select count(1) from enterprise_user where deleted = 0 and user_region_ids like concat("%", #{regionId}, "%")
</select>
<select id="getUserListByDeptLeader" resultMap="BaseResultMap">
select user_id, leader_dept_ids from enterprise_user where leader_dept_ids like concat("%", #{regionId}, "%") and deleted = 0
</select>
</mapper>

9
coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml
View File

@@ -128,4 +128,13 @@
where type = #{type}
and deleted = 0
</select>
<select id="getZoneInfoByRegionIds" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from
hy_intend_dev_zone_info
where
deleted = 0 and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId">associated_region_id like concat("%", #{regionId}, "%")</foreach>
</select>
</mapper>

2
coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml
View File

@@ -213,8 +213,8 @@
<if test="mobile != null and mobile!=''">
mobile = #{mobile},
</if>
where partner_id = #{partnerId}
</set>
where partner_id = #{partnerId}
</update>
<select id="getByPartnerIdAndLineId" resultMap="BaseResultMap" >

23
coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
View File

@@ -169,6 +169,12 @@
<if test="record.partnership != null">
partnership = #{record.partnership},
</if>
<if test="record.qualifyVerifyId != null">
qualify_verify_id = #{record.qualifyVerifyId},
</if>
<if test="record.intentionContractNo != null">
intention_contract_no = #{record.intentionContractNo},
</if>
<if test="record.wantSignTime != null">
want_sign_time = #{record.wantSignTime},
</if>
@@ -215,6 +221,21 @@
update_time = #{record.updateTime},
</if>
</set>
where id = #{record.id}
<where>
1 = 0
<if test="record.id != null">
or id = #{record.id}
</if>
<if test="record.partnerLineId != null">
or partner_id_line_id = #{record.partnerLineId}
</if>
</where>
</update>
<!-- 根据资质审核流程 id 获取面试会议 id -->
<select id="getInterviewIdByQualifyVerifyId" resultType="java.lang.String">
select partner_interview_id
from hy_partner_certification_info
where qualify_verify_id = #{qualifyVerifyId}
</select>
</mapper>

43
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
View File

@@ -220,8 +220,17 @@
<if test="authCode != null">
auth_code = #{authCode},
</if>
<if test="passFileUrl != null">
pass_file_url = #{passFileUrl},
<if test="passCode != null">
pass_code = #{passCode},
</if>
<if test="passPdfUrl != null">
pass_pdf_url = #{passPdfUrl},
</if>
<if test="passImageUrl != null">
pass_image_url = #{passImageUrl},
</if>
<if test="passTime != null">
pass_time = #{passTime},
</if>
<if test="expiryDate != null">
expiry_date = #{expiryDate},
@@ -250,11 +259,16 @@
<if test="interviewerEnterTime != null">
interviewer_enter_time = #{interviewerEnterTime},
</if>
<if test="qualifyVerifyId != null">
qualify_verify_id = #{qualifyVerifyId},
</if>
</set>
where id = #{id}
<where>
1 = 0
<if test="id != null">
or id = #{id}
</if>
<if test="interviewPlanId != null">
or interview_plan_id = #{interviewPlanId}
</if>
</where>
</update>
<!-- 根据加盟商id查询面试信息 -->
@@ -338,7 +352,7 @@
select
<include refid="Base_Column_List"/>
from
hy_partner_intent_info
hy_partner_interview
where
id = #{interviewId}
@@ -364,4 +378,19 @@
WHERE id = #{interviewId}
</update>
<!-- 根据 interviewId 获取意向区域 -->
<select id="getVerifyCityByInterviewId" resultType="java.lang.String">
SELECT area_path
FROM hy_open_area_info
WHERE id = (
SELECT want_shop_area
FROM hy_partner_intent_info
WHERE partner_line_id = (
SELECT partner_line_id
FROM hy_partner_interview
WHERE id = #{interviewId}
)
)
</select>
</mapper>

25
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -247,41 +247,44 @@
<select id="getInterviewList" resultType="com.cool.store.vo.interview.InterviewVO">
select hpip.id as interviewPlanId,
hpip.partner_id as partnerId,
hpui.username as partnerName,
hpui.mobile as partnerMobile,
hpip.room_id as roomId,
hpip.start_time as startTime,
hpui.username as interviewerName,
hpui.mobile as interviewerMobile,
hpip.interviewer as interviewerId,
eu.name as interviewerName,
eu.mobile as interviewerMobile,
hpip.room_status as roomStatus,
hpip.end_time as endTime
from hy_partner_interview_plan hpip
left join hy_partner_line_info hpll on hpip.partner_line_id = hpll.id
left join hy_partner_user_info hpui on hpui.partner_id = hpip.partner_id
left join enterprise_user eu on hpip.interviewer = eu.user_id
<where>
<if test="record.partnerName !=null and record.partnerName!=''">
hpui.username like concat('%',#{record.partnerName},'%')
</if>
<if test="record.partnerMobile !=null and record.partnerMobile!=''">
hpui.mobile like concat('%',#{record.partnerMobile},'%')
and hpui.mobile like concat('%',#{record.partnerMobile},'%')
</if>
<if test="record.roomId !=null and record.roomId!=''">
hpip.room_id = #{record.roomId}
and hpip.room_id = #{record.roomId}
</if>
<if test="record.interviewerName !=null and record.interviewerName!=''">
hpui.username like concat('%',#{record.interviewerName},'%')
and hpui.username like concat('%',#{record.interviewerName},'%')
</if>
<if test="record.interviewerMobile !=null and record.interviewerMobile!=''">
hpui.mobile like concat('%',#{record.interviewerMobile},'%')
and hpui.mobile like concat('%',#{record.interviewerMobile},'%')
</if>
<if test="record.roomStatus !=null and record.roomStatus!=''">
hpip.room_status = #{record.roomStatus}
and hpip.room_status = #{record.roomStatus}
</if>
<if test="record.startTime !=null and record.startTime!=''">
hpip.start_time &lt;= #{record.startTime}
and hpip.start_time &gt;= #{record.startTime}
</if>
<if test="record.endTime !=null and record.endTime!=''">
hpip.end_time &gt;= #{record.endTime}
and hpip.end_time &lt;= #{record.endTime}
</if>
</where>
@@ -289,7 +292,8 @@
<select id="getInterviewInfo" resultType="com.cool.store.vo.interview.InterviewVO">
select hpip.id as interviewPlanId,
hpi.id as interviewId,
hpi.qualify_verify_id as qualifyVerifyId,
hpci.qualify_verify_id as qualifyVerifyId,
hpci.intention_contract_no as intentionContractNo,
hpi.pass_time as passTime,
hpi.pass_reason as passReason,
hpi.recorder as recorderId,
@@ -317,6 +321,7 @@
left join hy_partner_line_info hpll on hpip.partner_line_id = hpll.id
left join hy_partner_user_info hpui on hpui.partner_id = hpip.partner_id
left join hy_partner_interview hpi on hpip.id = hpi.interview_plan_id
left join hy_partner_certification_info hpci on hpci.partner_interview_id = hpi.id
where hpip.id = #{interviewPlanId}
</select>
<select id="selectBySelective" resultType="com.cool.store.entity.HyPartnerInterviewPlanDO">

4
coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
View File

@@ -204,4 +204,8 @@
<update id="deleteRegionByRegionId">
update region set deleted = 1 where region_id = #{regionId}
</update>
<select id="getSubRegionIds" resultType="string">
select region_id from region where deleted = 0 and <foreach collection="regionPathList" item="regionPath" open="(" close=")" separator="or"> region_path like (#{regionPath, '%'})</foreach>
</select>
</mapper>

4
coolstore-partner-dao/src/main/resources/mapper/UserRegionMappingMapper.xml
View File

@@ -131,4 +131,8 @@
select region_id from user_region_mapping where user_id = #{userId}
</select>
<select id="getUserListByRegionIds" resultType="string">
select user_id from user_region_mapping where region_id in <foreach collection="regionIds" item="regionId" open="(" close=")" separator=",">#{regionId}</foreach>
</select>
</mapper>