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:
pserimal
2023-06-16 16:10:26 +08:00
parent 1836a50a3e 5093df2e62
commit 78daa0d0a3
101 changed files with 2615 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,17 @@
package com.cool.store.dao;
import com.cool.store.entity.HyIntendDevZoneInfoDO;
import com.cool.store.entity.HyOpenAreaInfoDO;
import com.cool.store.mapper.HyIntendDevZoneInfoMapper;
import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* @Author suzhuhong
@@ -37,14 +41,11 @@ public class HyIntendDevZoneInfoDAO {
}
public PageInfo<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type){
public List<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type){
if (StringUtils.isEmpty(type)){
return new PageInfo<>();
return new ArrayList<>();
}
return hyIntendDevZoneInfoMapper.getHyIntendDevZoneInfoList(type);
}
}

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java
View File

@@ -25,14 +25,11 @@ public class HyOpenAreaInfoDAO {
@Resource
HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
public PageInfo<HyOpenAreaInfoDO> queryKeyOpenArea(){
public List<HyOpenAreaInfoDO> queryKeyOpenArea(){
return hyOpenAreaInfoMapper.queryKeyOpenArea();
}
public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,Boolean filterData){
if (StringUtils.isEmpty(keyword)){
return new ArrayList<>();
}
return hyOpenAreaInfoMapper.queryByKeyword(keyword,filterData);
}

9
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java
View File

@@ -2,7 +2,7 @@ package com.cool.store.dao;
import com.cool.store.entity.HyPartnerBaseInfoDO;
import com.cool.store.mapper.HyPartnerBaseInfoMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
@@ -38,4 +38,11 @@ public class HyPartnerBaseInfoDAO {
return hyPartnerBaseInfoMapper.updateByPartnerId(userName,mobile,partnerId);
}
public HyPartnerBaseInfoDO getByPartnerIdAndLineId(String partnerId, Long partnerLineId){
if (StringUtils.isEmpty(partnerId) || partnerLineId == null){
return null;
}
return hyPartnerBaseInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId);
}
}

26
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerClerkDAO.java
View File

@@ -2,11 +2,14 @@ package com.cool.store.dao;
import com.cool.store.entity.HyPartnerClerkDO;
import com.cool.store.mapper.HyPartnerClerkMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
/**
* @Author suzhuhong
@@ -31,4 +34,25 @@ public class HyPartnerClerkDAO {
return hyPartnerClerkMapper.getHyPartnerClerkList(lineId);
}
public int batchInsert(List<HyPartnerClerkDO> hyPartnerClerkDOList){
if (CollectionUtils.isEmpty(hyPartnerClerkDOList)){
return -1;
}
return hyPartnerClerkMapper.batchInsert(hyPartnerClerkDOList);
}
public void deleteByPartnerIdAndLineId(String partnerId, Long partnerLineId){
if (StringUtils.isEmpty(partnerId) || Objects.isNull(partnerLineId)){
return;
}
hyPartnerClerkMapper.deleteByPartnerIdAndLineId(partnerId, partnerLineId);
}
public List<HyPartnerClerkDO> listByPartnerIdAndLineId(String partnerId, Long partnerLineId){
if (StringUtils.isEmpty(partnerId) || Objects.isNull(partnerLineId)){
return Collections.emptyList();
}
return hyPartnerClerkMapper.listByPartnerIdAndLineId(partnerId, partnerLineId);
}
}

13
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java
View File

@@ -4,13 +4,11 @@ import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
import com.cool.store.entity.HyPartnerIntentInfoDO;
import com.cool.store.mapper.HyPartnerIntentInfoMapper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
/**
* @Author suzhuhong
@@ -48,12 +46,19 @@ public class HyPartnerIntentInfoDAO {
}
public PartnerIntentApplyInfoDTO selectByLineId(Long lineId){
public HyPartnerIntentInfoDO selectByLineId(Long lineId){
if (lineId==null){
return null;
}
return hyPartnerIntentInfoMapper.selectByLineId(lineId);
}
public HyPartnerIntentInfoDO getByPartnerIdAndLineId(String partnerId, Long partnerLineId){
if (StringUtils.isEmpty(partnerId) || Objects.isNull(partnerLineId)){
return null;
}
return hyPartnerIntentInfoMapper.getByPartnerIdAndLineId(partnerId, partnerLineId);
}
}

39
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
View File

@@ -1,19 +1,20 @@
package com.cool.store.dao;
import com.cool.store.dto.partner.PartnerBlackListDTO;
import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO;
import com.cool.store.dto.partner.StageCountDTO;
import com.cool.store.dto.partner.*;
import com.cool.store.entity.HyPartnerLineInfoDO;
import com.cool.store.mapper.HyPartnerLineInfoMapper;
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;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -113,8 +114,8 @@ public class HyPartnerLineInfoDAO {
}
public PageInfo<PartnerBlackListDTO> getBlackList( String keyWord, String intentArea , Integer acceptAdjustType){
return hyPartnerLineInfoMapper.getBlackList(keyWord,intentArea,acceptAdjustType);
public PageInfo<PartnerBlackListDTO> getBlackList( String userNameKeyword,String phoneKeyword, String intentArea , Integer acceptAdjustType){
return hyPartnerLineInfoMapper.getBlackList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType);
}
@@ -125,7 +126,37 @@ public class HyPartnerLineInfoDAO {
return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason);
}
public PageInfo<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, Date updateStartTime, Date updateEndTime, List<String> userIdList){
return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType,updateStartTime,updateEndTime,userIdList);
}
public List<HyPartnerLineInfoDO> getPartnerLastLine(List<String> partnerIdList){
if (CollectionUtils.isEmpty(partnerIdList)){
return new ArrayList<>();
}
return hyPartnerLineInfoMapper.getPartnerLastLine(partnerIdList);
}
public HyPartnerLineInfoDO getByPartnerId(String partnerId){
if (StringUtils.isEmpty(partnerId)){
return null;
}
return hyPartnerLineInfoMapper.getByPartnerId(partnerId);
}
public List<LineCountDTO> getFollowCountList( List<String> partnerIdList){
if (CollectionUtils.isEmpty(partnerIdList)){
return new ArrayList<>();
}
return hyPartnerLineInfoMapper.getFollowCountList(partnerIdList);
}
public List<HyPartnerLineInfoDO> getHyPartnerLineInfoListByIds( List<Long> lineIds){
if (CollectionUtils.isEmpty(lineIds)){
return new ArrayList<>();
}
return hyPartnerLineInfoMapper.getHyPartnerLineInfoListByIds(lineIds);
}
}

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

@@ -68,5 +68,12 @@ public class HyPartnerUserInfoDAO {
return hyPartnerUserInfoMapper.insertSelective(record);
}
public int updateJoinKnowById(Integer isWritePartnerKnow, Long id){
if (id == null || isWritePartnerKnow == null){
return 0;
}
return hyPartnerUserInfoMapper.updateJoinKnowById(isWritePartnerKnow, id);
}
}

26
coolstore-partner-dao/src/main/java/com/cool/store/mapper/DingdingUserMapper.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.mapper;
import com.cool.store.entity.DingdingUserDO;
/**
* @author zhangchenbiao
* @date 2023-06-15 10:03
*/
public interface DingdingUserMapper {
/**
*
* 默认插入方法，只会给有值的字段赋值
* 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null
* dateTime:2023-06-15 10:03
*/
int insertSelective(DingdingUserDO record);
/**
*
* 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的
* dateTime:2023-06-15 10:03
*/
int updateByPrimaryKeySelective(DingdingUserDO record);
DingdingUserDO selectDingDingUserByMobile(String mobile);
}

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

@@ -4,6 +4,8 @@ import com.cool.store.entity.HyIntendDevZoneInfoDO;
import com.github.pagehelper.PageInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author zhangchenbiao
* @date 2023-05-29 03:50
@@ -36,5 +38,5 @@ public interface HyIntendDevZoneInfoMapper {
* @param type
* @return
*/
PageInfo<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type);
List<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type);
}

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

@@ -32,7 +32,7 @@ public interface HyOpenAreaInfoMapper {
* 查询重点城市
* @return
*/
PageInfo<HyOpenAreaInfoDO> queryKeyOpenArea();
List<HyOpenAreaInfoDO> queryKeyOpenArea();
/**

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java
View File

@@ -33,4 +33,7 @@ public interface HyPartnerBaseInfoMapper {
int updateByPartnerId(@Param("userName") String userName,
@Param("mobile") String mobile,
@Param("partnerId") String partnerId);
HyPartnerBaseInfoDO getByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId);
}

13
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java
View File

@@ -27,4 +27,17 @@ public interface HyPartnerClerkMapper {
List<HyPartnerClerkDO> getHyPartnerClerkList(@Param("lineId") Long lineId);
int batchInsert(@Param("recordList") List<HyPartnerClerkDO> recordList);
void deleteByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId);
/**
* 查询店员信息
* @return
*/
List<HyPartnerClerkDO> listByPartnerIdAndLineId(@Param("partnerId") String partnerId,
@Param("partnerLineId") Long partnerLineId);
}

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java
View File

@@ -46,5 +46,7 @@ public interface HyPartnerIntentInfoMapper {
* @param lineId
* @return
*/
PartnerIntentApplyInfoDTO selectByLineId(@Param("lineId") Long lineId);
HyPartnerIntentInfoDO selectByLineId(@Param("lineId") Long lineId);
HyPartnerIntentInfoDO getByPartnerIdAndLineId(@Param("partnerId") String partnerId, @Param("partnerLineId") Long partnerLineId);
}

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

@@ -74,4 +74,8 @@ public interface HyPartnerInterviewMapper {
*/
int updatePassLetterInfo(@Param("passCode") String passCode, @Param("passPdfUrl") String passPdfUrl, @Param("passImageUrl") String passImageUrl, @Param("expiryDate") String expiryDate, @Param("interviewId") String interviewId);
/**
* 根据面试 id 查询面试信息
*/
HyPartnerInterviewDO selectByPrimaryKeySelective(String interviewId);
}

54
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
View File

@@ -1,14 +1,14 @@
package com.cool.store.mapper;
import com.cool.store.dto.partner.*;
import com.cool.store.dto.partner.PartnerBlackListDTO;
import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO;
import com.cool.store.dto.partner.StageCountDTO;
import com.cool.store.entity.HyPartnerLineInfoDO;
import com.cool.store.entity.HyPartnerLineInfoDO;
import com.github.pagehelper.PageInfo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
@@ -109,12 +109,14 @@ public interface HyPartnerLineInfoMapper {
/**
* 查询黑名单列表
* @param keyWord
* @param userNameKeyword
* @param phoneKeyword
* @param intentArea
* @param acceptAdjustType
* @return
*/
PageInfo<PartnerBlackListDTO> getBlackList(@Param("keyWord") String keyWord,
PageInfo<PartnerBlackListDTO> getBlackList(@Param("userNameKeyword") String userNameKeyword,
@Param("phoneKeyword") String phoneKeyword,
@Param("intentArea") String intentArea ,
@Param("acceptAdjustType") Integer acceptAdjustType);
@@ -132,4 +134,48 @@ public interface HyPartnerLineInfoMapper {
@Param("joinReason") String joinReason,
@Param("removeReason") String removeReason);
HyPartnerLineInfoDO getByPartnerId(@Param("partnerId") String partnerId);
/**
* 查询公海线索
* @param userNameKeyword
* @param phoneKeyword
* @param intentArea
* @param acceptAdjustType
* @param updateStartTime
* @param updateEndTime
* @param userIdList
* @return
*/
PageInfo<PublicSeaLineDTO> getPublicSeaLineList(@Param("userNameKeyword") String userNameKeyword,
@Param("phoneKeyword") String phoneKeyword,
@Param("intentArea") String intentArea,
@Param("acceptAdjustType") Integer acceptAdjustType,
@Param("updateStartTime") Date updateStartTime,
@Param("updateEndTime") Date updateEndTime,
@Param("userIdList") List<String> userIdList);
/**
* 查询对应的加盟商最近线索
* @param partnerIdList
* @return
*/
List<HyPartnerLineInfoDO> getPartnerLastLine(@Param("partnerIdList") List<String> partnerIdList);
/**
* 加盟商跟进次数
* @param partnerIdList
* @return
*/
List<LineCountDTO> getFollowCountList(@Param("partnerIdList") List<String> partnerIdList);
/**
* 根据线索ID查询线索数据
* @param lineIds
* @return
*/
List<HyPartnerLineInfoDO> getHyPartnerLineInfoListByIds(@Param("lineIds") List<Long> lineIds);
}

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java
View File

@@ -40,4 +40,7 @@ public interface HyPartnerUserInfoMapper {
* @return
*/
List<HyPartnerUserInfoDO> selectByPartnerIds(@Param("partnerIdList") List<String> partnerIdList);
int updateJoinKnowById(@Param("isWritePartnerKnow")Integer isWritePartnerKnow, @Param("id")Long id);
}

309
coolstore-partner-dao/src/main/resources/mapper/DingdingUserMapper.xml Normal file
View File

@@ -0,0 +1,309 @@
<?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">
<mapper namespace="com.cool.store.mapper.DingdingUserMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.DingdingUserDO">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="userid" jdbcType="VARCHAR" property="userid" />
<result column="unionid" jdbcType="VARCHAR" property="unionid" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="is_boss" jdbcType="TINYINT" property="isBoss" />
<result column="hired_date" jdbcType="VARCHAR" property="hiredDate" />
<result column="is_senior" jdbcType="TINYINT" property="isSenior" />
<result column="tel" jdbcType="VARCHAR" property="tel" />
<result column="work_place" jdbcType="VARCHAR" property="workPlace" />
<result column="email" jdbcType="VARCHAR" property="email" />
<result column="active" jdbcType="TINYINT" property="active" />
<result column="avatar" jdbcType="VARCHAR" property="avatar" />
<result column="is_admin" jdbcType="TINYINT" property="isAdmin" />
<result column="is_hide" jdbcType="TINYINT" property="isHide" />
<result column="job_number" jdbcType="VARCHAR" property="jobNumber" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="state_code" jdbcType="VARCHAR" property="stateCode" />
<result column="real_authed" jdbcType="TINYINT" property="realAuthed" />
<result column="db_update_timestamp" jdbcType="TIMESTAMP" property="dbUpdateTimestamp" />
<result column="position" jdbcType="VARCHAR" property="position" />
<result column="mobile" jdbcType="VARCHAR" property="mobile" />
<result column="check_status" jdbcType="TINYINT" property="checkStatus" />
<result column="job_status" jdbcType="TINYINT" property="jobStatus" />
<result column="config_code_id" jdbcType="INTEGER" property="configCodeId" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.cool.store.entity.DingdingUserDO">
<result column="is_leader_in_depts" jdbcType="LONGVARCHAR" property="isLeaderInDepts" />
<result column="department" jdbcType="LONGVARCHAR" property="department" />
<result column="extattr" jdbcType="LONGVARCHAR" property="extattr" />
<result column="roles" jdbcType="LONGVARCHAR" property="roles" />
</resultMap>
<sql id="Base_Column_List">
id, userid, unionid, remark, is_boss, hired_date, is_senior, tel, work_place, email,
active, avatar, is_admin, is_hide, job_number, name, state_code, real_authed, db_update_timestamp,
position, mobile, check_status, job_status, config_code_id
</sql>
<sql id="Blob_Column_List">
is_leader_in_depts, department, extattr, roles
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into dingding_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userid != null">
userid,
</if>
<if test="unionid != null">
unionid,
</if>
<if test="remark != null">
remark,
</if>
<if test="isBoss != null">
is_boss,
</if>
<if test="hiredDate != null">
hired_date,
</if>
<if test="isSenior != null">
is_senior,
</if>
<if test="tel != null">
tel,
</if>
<if test="workPlace != null">
work_place,
</if>
<if test="email != null">
email,
</if>
<if test="active != null">
active,
</if>
<if test="avatar != null">
avatar,
</if>
<if test="isAdmin != null">
is_admin,
</if>
<if test="isHide != null">
is_hide,
</if>
<if test="jobNumber != null">
job_number,
</if>
<if test="name != null">
name,
</if>
<if test="stateCode != null">
state_code,
</if>
<if test="realAuthed != null">
real_authed,
</if>
<if test="dbUpdateTimestamp != null">
db_update_timestamp,
</if>
<if test="position != null">
position,
</if>
<if test="mobile != null">
mobile,
</if>
<if test="checkStatus != null">
check_status,
</if>
<if test="jobStatus != null">
job_status,
</if>
<if test="configCodeId != null">
config_code_id,
</if>
<if test="isLeaderInDepts != null">
is_leader_in_depts,
</if>
<if test="department != null">
department,
</if>
<if test="extattr != null">
extattr,
</if>
<if test="roles != null">
roles,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userid != null">
#{userid},
</if>
<if test="unionid != null">
#{unionid},
</if>
<if test="remark != null">
#{remark},
</if>
<if test="isBoss != null">
#{isBoss},
</if>
<if test="hiredDate != null">
#{hiredDate},
</if>
<if test="isSenior != null">
#{isSenior},
</if>
<if test="tel != null">
#{tel},
</if>
<if test="workPlace != null">
#{workPlace},
</if>
<if test="email != null">
#{email},
</if>
<if test="active != null">
#{active},
</if>
<if test="avatar != null">
#{avatar},
</if>
<if test="isAdmin != null">
#{isAdmin},
</if>
<if test="isHide != null">
#{isHide},
</if>
<if test="jobNumber != null">
#{jobNumber},
</if>
<if test="name != null">
#{name},
</if>
<if test="stateCode != null">
#{stateCode},
</if>
<if test="realAuthed != null">
#{realAuthed},
</if>
<if test="dbUpdateTimestamp != null">
#{dbUpdateTimestamp},
</if>
<if test="position != null">
#{position},
</if>
<if test="mobile != null">
#{mobile},
</if>
<if test="checkStatus != null">
#{checkStatus},
</if>
<if test="jobStatus != null">
#{jobStatus},
</if>
<if test="configCodeId != null">
#{configCodeId},
</if>
<if test="isLeaderInDepts != null">
#{isLeaderInDepts},
</if>
<if test="department != null">
#{department},
</if>
<if test="extattr != null">
#{extattr},
</if>
<if test="roles != null">
#{roles},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
update dingding_user
<set>
<if test="userid != null">
userid = #{userid},
</if>
<if test="unionid != null">
unionid = #{unionid},
</if>
<if test="remark != null">
remark = #{remark},
</if>
<if test="isBoss != null">
is_boss = #{isBoss},
</if>
<if test="hiredDate != null">
hired_date = #{hiredDate},
</if>
<if test="isSenior != null">
is_senior = #{isSenior},
</if>
<if test="tel != null">
tel = #{tel},
</if>
<if test="workPlace != null">
work_place = #{workPlace},
</if>
<if test="email != null">
email = #{email},
</if>
<if test="active != null">
active = #{active},
</if>
<if test="avatar != null">
avatar = #{avatar},
</if>
<if test="isAdmin != null">
is_admin = #{isAdmin},
</if>
<if test="isHide != null">
is_hide = #{isHide},
</if>
<if test="jobNumber != null">
job_number = #{jobNumber},
</if>
<if test="name != null">
name = #{name},
</if>
<if test="stateCode != null">
state_code = #{stateCode},
</if>
<if test="realAuthed != null">
real_authed = #{realAuthed},
</if>
<if test="dbUpdateTimestamp != null">
db_update_timestamp = #{dbUpdateTimestamp},
</if>
<if test="position != null">
position = #{position},
</if>
<if test="mobile != null">
mobile = #{mobile},
</if>
<if test="checkStatus != null">
check_status = #{checkStatus},
</if>
<if test="jobStatus != null">
job_status = #{jobStatus},
</if>
<if test="configCodeId != null">
config_code_id = #{configCodeId},
</if>
<if test="isLeaderInDepts != null">
is_leader_in_depts = #{isLeaderInDepts},
</if>
<if test="department != null">
department = #{department},
</if>
<if test="extattr != null">
extattr = #{extattr},
</if>
<if test="roles != null">
roles = #{roles},
</if>
</set>
where id = #{id}
</update>
<select id="selectDingDingUserByMobile" resultType="com.cool.store.entity.DingdingUserDO">
select
<include refid="Base_Column_List"/>,
<include refid="Blob_Column_List"/>
from
dingding_user
where
mobile = #{mobile}
</select>
</mapper>

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

@@ -84,7 +84,7 @@
partner_url = #{record.partnerUrl},
tencent_video_account = #{record.tencentVideoAccount},
tencent_video_key = #{record.tencentVideoKey},
update_user_id = #{record.updateUserId},
update_user_id = #{record.updateUserId}
where id = #{record.id}
</update>
</mapper>

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

@@ -120,10 +120,12 @@
where id = #{record.id}
</update>
<select id="getHyIntendDevZoneInfoList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
*
from hy_intend_dev_zone_info
where type = #{type}
and deleted = 0
</select>
</mapper>

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

@@ -91,8 +91,8 @@
<if test="type!=null and type!=''">
and type = #{type}
</if>
<if test="deleteByMappingIds!=null and deleteByMappingIds.size>0">
<foreach collection="deleteByMappingIds" open="and mapping_id in (" close=")" separator="," item="mappingId">
<if test="mappingIds!=null and mappingIds.size>0">
<foreach collection="mappingIds" open="and mapping_id in (" close=")" separator="," item="mappingId">
#{mappingId}
</foreach>
</if>
@@ -112,7 +112,7 @@
<foreach collection="recordList" item="record" separator=",">
(#{record.mappingId},
#{record.openAreaMappingId},
#{record.type}
#{record.type})
</foreach>
</insert>
@@ -124,7 +124,7 @@
from hy_intend_developement_mapping a inner join hy_intend_dev_zone_info b on a.mapping_id = b.id
<where>
<if test="mappingIdList!=null and mappingIdList.size>0">
<foreach collection="mappingIdList" open="and a.open_area_mapping_id in (" close=")" separator="," item="mappingId">
<foreach collection="mappingIdList" open="and a.mapping_id in (" close=")" separator="," item="mappingId">
#{mappingId}
</foreach>
</if>

12
coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
View File

@@ -185,10 +185,14 @@
<select id="queryByKeyword" resultMap="BaseResultMap">
select * from
hy_open_area_info
where area_path like concat('%',#{keyword},'%')
<if test="filterData!=null and filterData==true">
and province_city_flag = 1
</if>
<where>
<if test="keyword!=null and keyword!=''">
and area_path like concat('%',#{keyword},'%')
</if>
<if test="filterData!=null and filterData==true">
and province_city_flag = 1
</if>
</where>
</select>

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

@@ -216,4 +216,12 @@
where partner_id = #{partnerId}
</set>
</update>
<select id="getByPartnerIdAndLineId" resultMap="BaseResultMap" >
select
<include refid="Base_Column_List"></include>
from hy_partner_base_info
where partner_id = #{partnerId} and partner_line_id = #{partnerLineId}
</select>
</mapper>

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

@@ -8,7 +8,6 @@
<result column="partner_interview_id" jdbcType="BIGINT" property="partnerInterviewId" />
<result column="partnership" jdbcType="VARCHAR" property="partnership" />
<result column="want_sign_time" jdbcType="TIMESTAMP" property="wantSignTime" />
<result column="data_source" jdbcType="TINYINT" property="dataSource" />
<result column="partner_fee" jdbcType="VARCHAR" property="partnerFee" />
<result column="security_fund" jdbcType="VARCHAR" property="securityFund" />
<result column="technical_service_fee" jdbcType="VARCHAR" property="technicalServiceFee" />
@@ -26,7 +25,7 @@
</resultMap>
<sql id="Base_Column_List">
id, partner_id, partner_line_id, partner_interview_id, partnership, want_sign_time,
data_source, partner_fee, security_fund, technical_service_fee, intention_money,
partner_fee, security_fund, technical_service_fee, intention_money,
intention_signer_username, intention_signer_mobile, intention_edu, real_control_username,
real_control_idcard, signer_real_control_relation, signer_other_real_control_relation,
signer_real_control_relation_cert, create_time, update_time
@@ -49,9 +48,6 @@
<if test="record.wantSignTime != null">
want_sign_time,
</if>
<if test="record.dataSource != null">
data_source,
</if>
<if test="record.partnerFee != null">
partner_fee,
</if>
@@ -176,9 +172,6 @@
<if test="record.wantSignTime != null">
want_sign_time = #{record.wantSignTime},
</if>
<if test="record.dataSource != null">
data_source = #{record.dataSource},
</if>
<if test="record.partnerFee != null">
partner_fee = #{record.partnerFee},
</if>

33
coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml
View File

@@ -108,4 +108,37 @@
from hy_partner_clerk
where partner_line_id = #{lineId}
</select>
<insert id="batchInsert">
insert into
hy_partner_clerk
(
partner_line_id,
partner_id,
username,
relationship,
age,
choose_reason
)
values
<foreach collection="recordList" item="record" separator=",">
(#{record.partnerLineId},
#{record.partnerId},
#{record.username},
#{record.relationship},
#{record.age},
#{record.chooseReason})
</foreach>
</insert>
<delete id="deleteByPartnerIdAndLineId">
delete from hy_partner_clerk where partner_id = #{partnerId} and partner_line_id = #{partnerLineId}
</delete>
<select id="listByPartnerIdAndLineId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include> from
hy_partner_clerk
where partner_id = #{partnerId} and partner_line_id = #{partnerLineId}
</select>
</mapper>

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

@@ -279,7 +279,7 @@
order by b.create_time
</select>
<select id="selectByLineId" resultType="com.cool.store.dto.partner.PartnerIntentApplyInfoDTO">
<select id="selectByLineId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
from hy_partner_intent_info
@@ -288,4 +288,11 @@
</where>
</select>
<select id="getByPartnerIdAndLineId" resultMap="BaseResultMap" >
select
<include refid="Base_Column_List"></include>
from hy_partner_intent_info
where partner_id = #{partnerId} and partner_line_id = #{partnerLineId}
</select>
</mapper>

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

@@ -14,6 +14,7 @@
<result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />
<result column="summary" jdbcType="VARCHAR" property="summary" />
<result column="auth_code" jdbcType="VARCHAR" property="authCode" />
<result column="qualify_verify_id" jdbcType="VARCHAR" property="qualifyVerifyId" />
<result column="pass_file_url" jdbcType="VARCHAR" property="passFileUrl" />
<result column="expiry_date" jdbcType="TIMESTAMP" property="expiryDate" />
<result column="latest_log_message" jdbcType="VARCHAR" property="latestLogMessage" />
@@ -46,7 +47,7 @@
<sql id="Base_Column_List">
id, status, partner_line_id, interview_plan_id, partner_id, deadline, interviewer,
recorder, process_info, record_time, summary, auth_code, pass_file_url, expiry_date,
recorder, process_info, record_time, summary, auth_code, qualify_verify_id, pass_file_url, expiry_date,
latest_log_message, pass_reason, certify_file, create_time, update_time, approve_time,
partner_enter_time, interviewer_enter_time
</sql>
@@ -249,6 +250,9 @@
<if test="interviewerEnterTime != null">
interviewer_enter_time = #{interviewerEnterTime},
</if>
<if test="qualifyVerifyId != null">
qualify_verify_id = #{qualifyVerifyId},
</if>
</set>
where id = #{id}
</update>
@@ -330,6 +334,15 @@
WHERE partner_id = #{partner_id}
)
</select>
<select id="selectByPrimaryKeySelective" resultType="com.cool.store.entity.HyPartnerInterviewDO">
select
<include refid="Base_Column_List"/>
from
hy_partner_intent_info
where
id = #{interviewId}
</select>
<!-- 生成通过函 pdf 后修改 -->
<update id="updatePassLetterInfo">

82
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -357,8 +357,11 @@
from hy_partner_line_info a inner join hy_partner_user_info b where a.partner_id = b.partner_id
where deleted = 0
and line_status = 3
<if test="keyWord!=null and keyWord !=''">
and (b.username like concat('%', #{keyWord}, '%') or b.mobile like concat('%', #{keyWord}, '%'))
<if test="userNameKeyword!=null and userNameKeyword !=''">
and b.username like concat('%', #{userNameKeyword}, '%')
</if>
<if test="phoneKeyword!=null and phoneKeyword !=''">
and b.mobile like concat('%', #{phoneKeyword}, '%')
</if>
<if test="intentArea!=null and intentArea!=''">
and b.want_shop_area = #{intentArea}
@@ -384,4 +387,79 @@
where id = #{lineId}
</update>
<select id="getByPartnerId" resultMap="BaseResultMap" >
select
<include refid="Base_Column_List"></include>
from hy_partner_line_info
where partner_id = #{partnerId}
</select>
<select id="getPublicSeaLineList" resultType="com.cool.store.dto.partner.PublicSeaLineDTO">
select
a.create_time as createTime,
b.partner_id as partner_id,
b.mobile as mobile,
b.username as userName,
b.want_shop_area as wantShopArea,
b.accept_adjust_type as acceptAdjustType
FROM hy_partner_line_info a inner JOIN hy_partner_user_info b on a.partner_id = b.partner_id
where a.line_status = 1
<if test="userNameKeyword!=null and userNameKeyword!=''">
and b.username like concat('%',#{userNameKeyword},'%')
</if>
<if test="phoneKeyword!=null and phoneKeyword!=''">
and b.mobile like concat('%',#{phoneKeyword},'%')
</if>
<if test="intentArea!=null and intentArea!=''">
and b.want_shop_area = #{intentArea}
</if>
<if test="acceptAdjustType!=null">
and b.accept_adjust_type = #{acceptAdjustType}
</if>
<if test="updateStartTime!=null and updateEndTime!=''">
and a.update_time BETWEEN #{updateStartTime} and #{updateEndTime}
</if>
<if test="userIdList!=null and userIdList.size>0">
<foreach collection="userIdList" item="userId" open="and a.investment_manager in (" close=")" separator=",">
#{userId}
</foreach>
</if>
</select>
<select id="getPartnerLastLine" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"></include>
FROM hy_partner_line_info h1
WHERE h1.create_time = (
SELECT MAX(h2.create_time)
FROM hy_partner_line_info h2
WHERE h1.partner_id = h2.partner_id
<if test="partnerIdList!=null and partnerIdList.size>0">
<foreach collection="partnerIdList" item="partnerId" open="and h1.partner_id in (" close=")" separator=",">
#{partnerId}
</foreach>
</if>
)
</select>
<select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">
SELECT partner_id, COUNT(1) AS num_of_leads
FROM hy_partner_line_info
GROUP BY partner_id;
</select>
<select id="getHyPartnerLineInfoListByIds" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
FROM hy_partner_line_info
<where>
<if test="lineIds!=null and lineIds.size>0">
<foreach collection="lineIds" item="lineId" open="and id in (" close=")" separator=",">
#{partnerId}
</foreach>
</if>
</where>
</select>
</mapper>

7
coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
View File

@@ -147,4 +147,11 @@
</set>
where id = #{record.id}
</update>
<update id="updateJoinKnowById">
update hy_partner_user_info
set `is_write_partner_know`=#{isWritePartnerKnow,jdbcType=INTEGER}
where id=#{id,jdbcType=BIGINT}
</update>
</mapper>