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

This commit is contained in:
zhangchenbiao
2023-06-29 09:41:54 +08:00
106 changed files with 2634 additions and 299 deletions

View File

@@ -108,4 +108,8 @@ public class EnterpriseUserDAO {
List<EnterpriseUserDO> userList = getUserInfoByUserIds(userIds);
return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile(), o.getName())).collect(Collectors.toMap(k -> k.getUserId(), v -> v.getName() + " " + v.getMobile()));
}
public String selectByMobile(String mobile) {
return enterpriseUserMapper.selectByMobile(mobile);
}
}

View File

@@ -75,11 +75,11 @@ public class HyPartnerInterviewPlanDAO {
* @param workflowStatus
* @return
*/
public List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){
public List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus,Boolean filter){
if (StringUtils.isEmpty(userId)){
return Lists.newArrayList();
}
return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus);
return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus,filter);
}
public Long selectInterviewIdByLineId(Long lineId){

View File

@@ -90,4 +90,7 @@ public interface EnterpriseUserMapper {
* @return
*/
List<EnterpriseUserDO> getUserListByRegionIds(@Param("regionIds") List<String> regionIds);
String selectByMobile(@Param("mobile") String mobile);
}

View File

@@ -37,4 +37,6 @@ public interface HyPartnerCertificationInfoMapper {
*/
String getInterviewPlanIdByQualifyVerifyId(String qualifyVerifyId);
HyPartnerCertificationInfoDO selectByPartnerLineId(@Param("partnerLineId") Long partnerLineId);
}

View File

@@ -35,6 +35,7 @@ public interface HyPartnerInterviewMapper {
* @return
*/
PartnerInterviewInfoVO queryByPartnerId(@Param("partnerId") String partnerId);
PartnerInterviewInfoVO queryByPartnerLineId(@Param("partnerLineId") String partnerLineId);
/**
* 根据会议 id 查询面试官 id

View File

@@ -72,7 +72,8 @@ public interface HyPartnerInterviewPlanMapper {
*/
List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(@Param("userId") String userId,
@Param("workflowStage") String workflowStage ,
@Param("workflowStatus") String workflowStatus);
@Param("workflowStatus") String workflowStatus,
@Param("filter") Boolean filter);
/**
* 查询面试列表

View File

@@ -3,6 +3,8 @@ package com.cool.store.mapper;
import com.cool.store.entity.HyPartnerTaskInfoLogDO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author zhangchenbiao
* @date 2023-05-29 03:53
@@ -22,4 +24,6 @@ public interface HyPartnerTaskInfoLogMapper {
* dateTime:2023-05-29 03:53
*/
int updateByPrimaryKeySelective(@Param("record") HyPartnerTaskInfoLogDO record);
List<HyPartnerTaskInfoLogDO> selectByPartnerLineIdAndOperateType(@Param("partnerLineId") Long partnerLineId, @Param("operateType") String operateType);
}

View File

@@ -0,0 +1,25 @@
package com.cool.store.mapper;
import com.cool.store.entity.HyPartnerUserChannelDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface HyPartnerUserChannelMapper {
int deleteByPrimaryKey(Long id);
int insert(HyPartnerUserChannelDO record);
int insertSelective(HyPartnerUserChannelDO record);
HyPartnerUserChannelDO selectByPrimaryKey(Long id);
int updateByPrimaryKeySelective(HyPartnerUserChannelDO record);
int updateByPrimaryKey(HyPartnerUserChannelDO record);
HyPartnerUserChannelDO selectByChannelId(@Param("channelId") Long id);
HyPartnerUserChannelDO selectByChannelName(@Param("channelName") String channelName);
}

View File

@@ -1,6 +1,7 @@
package com.cool.store.mapper;
import com.cool.store.entity.HyPartnerUserInfoDO;
import com.cool.store.entity.SyncEcCustomerDO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -43,4 +44,7 @@ public interface HyPartnerUserInfoMapper {
int updateJoinKnowById(@Param("isWritePartnerKnow")Integer isWritePartnerKnow, @Param("id")Long id);
List<SyncEcCustomerDO> selectByHourDate(@Param("selectTime") String hourDayDate, @Param("now") String now,@Param("limit1")Integer limit1,@Param("limit2")Integer limit2);
int selectByHourDateCount(@Param("selectTime") String hourDayDate, @Param("now") String now);
}

View File

@@ -0,0 +1,20 @@
package com.cool.store.mapper;
import com.cool.store.entity.MDMAreaDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface MdmAreaMapper {
/**
* 获取 MDM 省级地区数据
* @return
*/
List<MDMAreaDO> getProvince();
List<MDMAreaDO> getSonArea(@Param("code") String code);
}

View File

@@ -308,4 +308,7 @@
SUBSTR(jobnumber,1,1),
CAST(SUBSTR(jobnumber,2) AS UNSIGNED) ASC
</select>
<select id="selectByMobile" resultType="java.lang.String">
SELECT user_id FROM enterprise_user WHERE mobile =#{mobile} LIMIT 1
</select>
</mapper>

View File

@@ -6,20 +6,6 @@
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
<result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId" />
<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="partner_fee" jdbcType="VARCHAR" property="partnerFee" />
<result column="security_fund" jdbcType="VARCHAR" property="securityFund" />
<result column="technical_service_fee" jdbcType="VARCHAR" property="technicalServiceFee" />
<result column="intention_money" jdbcType="VARCHAR" property="intentionMoney" />
<result column="intention_signer_username" jdbcType="VARCHAR" property="intentionSignerUsername" />
<result column="intention_signer_mobile" jdbcType="VARCHAR" property="intentionSignerMobile" />
<result column="intention_edu" jdbcType="VARCHAR" property="intentionEdu" />
<result column="real_control_username" jdbcType="VARCHAR" property="realControlUsername" />
<result column="real_control_idcard" jdbcType="VARCHAR" property="realControlIdcard" />
<result column="signer_real_control_relation" jdbcType="VARCHAR" property="signerRealControlRelation" />
<result column="signer_other_real_control_relation" jdbcType="VARCHAR" property="signerOtherRealControlRelation" />
<result column="signer_real_control_relation_cert" jdbcType="VARCHAR" property="signerRealControlRelationCert" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
@@ -42,53 +28,17 @@
<if test="record.partnerInterviewId != null">
partner_interview_id,
</if>
<if test="record.partnership != null">
partnership,
</if>
<if test="record.qualifyVerifyId != null">
qualify_verify_id,
</if>
<if test="record.intentionContractNo != null">
intention_contract_no,
</if>
<if test="record.wantSignTime != null">
want_sign_time,
<if test="record.dataSource != null">
data_source,
</if>
<if test="record.partnerFee != null">
partner_fee,
</if>
<if test="record.securityFund != null">
security_fund,
</if>
<if test="record.technicalServiceFee != null">
technical_service_fee,
</if>
<if test="record.intentionMoney != null">
intention_money,
</if>
<if test="record.intentionSignerUsername != null">
intention_signer_username,
</if>
<if test="record.intentionSignerMobile != null">
intention_signer_mobile,
</if>
<if test="record.intentionEdu != null">
intention_edu,
</if>
<if test="record.realControlUsername != null">
real_control_username,
</if>
<if test="record.realControlIdcard != null">
real_control_idcard,
</if>
<if test="record.signerRealControlRelation != null">
signer_real_control_relation,
</if>
<if test="record.signerOtherRealControlRelation != null">
signer_other_real_control_relation,
</if>
<if test="record.signerRealControlRelationCert != null">
signer_real_control_relation_cert,
<if test="record.certificationInfoRecordJson != null">
certification_info_record_json,
</if>
<if test="record.createTime != null">
create_time,
@@ -107,56 +57,17 @@
<if test="record.partnerInterviewId != null">
#{record.partnerInterviewId},
</if>
<if test="record.partnership != null">
#{record.partnership},
</if>
<if test="record.qualifyVerifyId != null">
#{record.qualifyVerifyId},
</if>
<if test="record.intentionContractNo != null">
#{record.intentionContractNo},
</if>
<if test="record.wantSignTime != null">
#{record.wantSignTime},
</if>
<if test="record.dataSource != null">
#{record.dataSource},
</if>
<if test="record.partnerFee != null">
#{record.partnerFee},
</if>
<if test="record.securityFund != null">
#{record.securityFund},
</if>
<if test="record.technicalServiceFee != null">
#{record.technicalServiceFee},
</if>
<if test="record.intentionMoney != null">
#{record.intentionMoney},
</if>
<if test="record.intentionSignerUsername != null">
#{record.intentionSignerUsername},
</if>
<if test="record.intentionSignerMobile != null">
#{record.intentionSignerMobile},
</if>
<if test="record.intentionEdu != null">
#{record.intentionEdu},
</if>
<if test="record.realControlUsername != null">
#{record.realControlUsername},
</if>
<if test="record.realControlIdcard != null">
#{record.realControlIdcard},
</if>
<if test="record.signerRealControlRelation != null">
#{record.signerRealControlRelation},
</if>
<if test="record.signerOtherRealControlRelation != null">
#{record.signerOtherRealControlRelation},
</if>
<if test="record.signerRealControlRelationCert != null">
#{record.signerRealControlRelationCert},
<if test="record.certificationInfoRecordJson != null">
#{record.certificationInfoRecordJson},
</if>
<if test="record.createTime != null">
#{record.createTime},
@@ -178,53 +89,17 @@
<if test="record.partnerInterviewId != null">
partner_interview_id = #{record.partnerInterviewId},
</if>
<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 test="record.dataSource != null">
data_source = #{record.dataSource},
</if>
<if test="record.partnerFee != null">
partner_fee = #{record.partnerFee},
</if>
<if test="record.securityFund != null">
security_fund = #{record.securityFund},
</if>
<if test="record.technicalServiceFee != null">
technical_service_fee = #{record.technicalServiceFee},
</if>
<if test="record.intentionMoney != null">
intention_money = #{record.intentionMoney},
</if>
<if test="record.intentionSignerUsername != null">
intention_signer_username = #{record.intentionSignerUsername},
</if>
<if test="record.intentionSignerMobile != null">
intention_signer_mobile = #{record.intentionSignerMobile},
</if>
<if test="record.intentionEdu != null">
intention_edu = #{record.intentionEdu},
</if>
<if test="record.realControlUsername != null">
real_control_username = #{record.realControlUsername},
</if>
<if test="record.realControlIdcard != null">
real_control_idcard = #{record.realControlIdcard},
</if>
<if test="record.signerRealControlRelation != null">
signer_real_control_relation = #{record.signerRealControlRelation},
</if>
<if test="record.signerOtherRealControlRelation != null">
signer_other_real_control_relation = #{record.signerOtherRealControlRelation},
</if>
<if test="record.signerRealControlRelationCert != null">
signer_real_control_relation_cert = #{record.signerRealControlRelationCert},
<if test="record.certificationInfoRecordJson != null">
certification_info_record_json = #{record.certificationInfoRecordJson},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime},
@@ -262,4 +137,10 @@
)
and deleted = 0
</select>
<select id="selectByPartnerLineId" resultType="com.cool.store.entity.HyPartnerCertificationInfoDO">
select
<include refid="Base_Column_List" />
from hy_partner_certification_info
where partner_line_id = #{partnerLineId}
</select>
</mapper>

View File

@@ -477,6 +477,14 @@
FROM hy_partner_interview
WHERE interview_plan_id = #{interviewPlanId}
</select>
<select id="queryByPartnerLineId" resultType="com.cool.store.vo.PartnerInterviewInfoVO">
SELECT t1.id interviewId, t1.id interview_id, t2.id as interviewPlanId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
FROM hy_partner_interview_plan t2
LEFT JOIN hy_partner_interview t1 ON t1.interview_plan_id = t2.id
WHERE t2.partner_line_id = #{partnerLineId}
AND t1.deleted = 0
AND t2.deleted = 0
</select>
<!-- 根据 room_id 添加 process_info -->
<update id="addVideoUrl">

View File

@@ -312,7 +312,10 @@
left join hy_partner_interview a on hpli.id = a.partner_line_id
left join hy_partner_interview_plan b on a.interview_plan_id = b.id
<where>
and hpli.deleted = 0 and hpli.line_status!=3 and b.deleted = 0
and hpli.deleted = 0 and hpli.line_status!=3
<if test="filter">
and b.deleted = 0
</if>
<if test="workflowStage!=null and workflowStage!=''">
and hpli.workflow_stage = #{workflowStage}
</if>

View File

@@ -20,12 +20,13 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="close_time" jdbcType="TIMESTAMP" property="closeTime" />
<result column="close_user_id" jdbcType="VARCHAR" property="closeUserId" />
<result column="user_channel_id" jdbcType="BIGINT" property="userChannelId" />
</resultMap>
<sql id="Base_Column_List">
id, partner_id, workflow_stage, workflow_status, line_status, investment_manager,
development_director, development_manager, deadline, pass_reason, reject_public_reason,
reject_real_reason, certify_file, deleted, create_time, update_time, close_time,
close_user_id
close_user_id,user_channel_id
</sql>
<select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
@@ -124,6 +125,9 @@
<if test="record.closeUserId != null">
close_user_id,
</if>
<if test="record.userChannelId != null">
user_channel_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="record.partnerId != null">
@@ -177,6 +181,9 @@
<if test="record.closeUserId != null">
#{record.closeUserId},
</if>
<if test="record.userChannelId != null">
#{record.userChannelId},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
@@ -239,6 +246,9 @@
<if test="record.removeBlackReason != null">
remove_black_reason = #{record.removeBlackReason},
</if>
<if test="record.userChannelId != null">
user_channel_id = #{record.userChannelId},
</if>
</set>
where id = #{record.id}
</update>
@@ -569,7 +579,7 @@
<select id="getLineFollowHistoryList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
FROM hy_partner_line_info
where (deleted = 1 or (deleted=0 and line_status=0 and close_time is not null))
where (deleted = 1 or (deleted=0 and line_status in (0,3) and close_time is not null))
and partner_id = #{partner_id}
</select>

View File

@@ -133,4 +133,13 @@
</set>
where id = #{record.id}
</update>
<select id="selectByPartnerLineIdAndOperateType" resultMap="ResultMapWithBLOBs">
select
<include refid="Base_Column_List"/>,
<include refid="Blob_Column_List"/>
from hy_partner_task_info_log
where partner_line_id = #{partnerLineId}
and operate_type = #{operateType}
order by create_time desc
</select>
</mapper>

View File

@@ -0,0 +1,93 @@
<?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.HyPartnerUserChannelMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyPartnerUserChannelDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="channel_id" jdbcType="BIGINT" property="channelId" />
<result column="channel_name" jdbcType="VARCHAR" property="channelName" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
id, channel_id, channel_name, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from hy_partner_user_channel
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectByChannelId" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from hy_partner_user_channel
where channel_id = #{channelId} limit 1
</select>
<select id="selectByChannelName" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from hy_partner_user_channel
where channel_name = #{channelName} limit 1
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from hy_partner_user_channel
where id = #{id,jdbcType=BIGINT}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.cool.store.entity.HyPartnerUserChannelDO" useGeneratedKeys="true">
insert into hy_partner_user_channel (channel_id, channel_name, create_time,
update_time)
values (#{channelId,jdbcType=BIGINT}, #{channelName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.cool.store.entity.HyPartnerUserChannelDO" useGeneratedKeys="true">
insert into hy_partner_user_channel
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="channelId != null">
channel_id,
</if>
<if test="channelName != null">
channel_name,
</if>
<if test="createTime != null">
create_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="channelId != null">
#{channelId,jdbcType=BIGINT},
</if>
<if test="channelName != null">
#{channelName,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyPartnerUserChannelDO">
update hy_partner_user_channel
<set>
<if test="channelId != null">
channel_id = #{channelId,jdbcType=BIGINT},
</if>
<if test="channelName != null">
channel_name = #{channelName,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.cool.store.entity.HyPartnerUserChannelDO">
update hy_partner_user_channel
set channel_id = #{channelId,jdbcType=BIGINT},
channel_name = #{channelName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

View File

@@ -51,6 +51,18 @@
</if>
</where>
</select>
<select id="selectByHourDate" resultType="com.cool.store.entity.SyncEcCustomerDO" >
SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile as followmobile FROM hy_partner_user_info a LEFT join hy_partner_line_info b on
a.partner_id=b.partner_id left join enterprise_user c on b.investment_manager=c.user_id
WHERE a.create_time BETWEEN #{selectTime} and #{now} or
a.update_time BETWEEN #{selectTime} and #{now} order by a.id Limit #{limit1},#{limit2}
</select>
<select id="selectByHourDateCount" resultType="java.lang.Integer">
SELECT count(*) FROM hy_partner_user_info a LEFT join hy_partner_line_info b on
a.partner_id=b.partner_id left join enterprise_user c on b.investment_manager=c.user_id
WHERE a.create_time BETWEEN #{selectTime} and #{now} or
a.update_time BETWEEN #{selectTime} and #{now}
</select>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_user_info

View File

@@ -0,0 +1,18 @@
<?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.MdmAreaMapper">
<!-- 获取 MDM 省级地区数据 -->
<select id="getProvince" resultType="com.cool.store.entity.MDMAreaDO">
SELECT id, instance_id, code, area_name, parent_code
FROM mdm_area
WHERE parent_code = '0'
</select>
<!-- 获取子级区域 -->
<select id="getSonArea" resultType="com.cool.store.entity.MDMAreaDO">
SELECT id, instance_id, code, area_name, parent_code
FROM mdm_area
WHERE parent_code = #{code}
</select>
</mapper>