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 01:52:21 +08:00
parent 4283a6d65d fa26330573
commit 3bf26f70e8
29 changed files with 208 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@ public class HyOpenAreaInfoDAO {
return hyOpenAreaInfoMapper.queryKeyOpenArea();
}
public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,Boolean filterData){
return hyOpenAreaInfoMapper.queryByKeyword(keyword,filterData);
public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,String areaStatus,Boolean filterData){
return hyOpenAreaInfoMapper.queryByKeyword(keyword,areaStatus,filterData);
}
public List<HyOpenAreaInfoDO> queryFirstLevel(){

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

@@ -8,6 +8,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
@@ -38,9 +40,9 @@ public class HyPartnerIntentInfoDAO {
}
public PageInfo<PartnerIntentApplyInfoDTO> selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus){
public List<PartnerIntentApplyInfoDTO> selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus){
if (StringUtils.isEmpty(userId)){
return new PageInfo<>();
return new ArrayList<>();
}
return hyPartnerIntentInfoMapper.selectPartnerIntentApplyInfoList(userId,workflowStage,workflowStatus);
}

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

@@ -5,6 +5,7 @@ import com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO;
import com.cool.store.entity.HyPartnerInterviewPlanDO;
import com.cool.store.mapper.HyPartnerInterviewPlanMapper;
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;
@@ -74,9 +75,9 @@ public class HyPartnerInterviewPlanDAO {
* @param workflowStatus
* @return
*/
public PageInfo<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){
public List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(String userId, String workflowStage,String workflowStatus){
if (StringUtils.isEmpty(userId)){
return new PageInfo();
return Lists.newArrayList();
}
return hyPartnerInterviewPlanMapper.getPartnerInterviewInfoList(userId,workflowStage,workflowStatus);
}

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

@@ -6,6 +6,7 @@ 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.cool.store.vo.LineFollowHistoryVO;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
@@ -159,4 +160,16 @@ public class HyPartnerLineInfoDAO {
return hyPartnerLineInfoMapper.getHyPartnerLineInfoListByIds(lineIds);
}
/**
* 查询根据历史
* @param partnerId
* @return
*/
public List<HyPartnerLineInfoDO> getLineFollowHistoryList(String partnerId){
if (partnerId==null){
return new ArrayList<>();
}
return hyPartnerLineInfoMapper.getLineFollowHistoryList(partnerId);
}
}

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

@@ -40,6 +40,7 @@ public interface HyOpenAreaInfoMapper {
* @return
*/
List<HyOpenAreaInfoDO> queryByKeyword(@Param("keyword") String keyword,
@Param("areaStatus") String areaStatus,
@Param("filterData") Boolean filterData);
/**

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

@@ -37,7 +37,7 @@ public interface HyPartnerIntentInfoMapper {
* @param workflowStatus
* @return
*/
PageInfo<PartnerIntentApplyInfoDTO> selectPartnerIntentApplyInfoList(@Param("userId") String userId,
List<PartnerIntentApplyInfoDTO> selectPartnerIntentApplyInfoList(@Param("userId") String userId,
@Param("workflowStage") String workflowStage ,
@Param("workflowStatus") String workflowStatus);

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

@@ -69,7 +69,7 @@ public interface HyPartnerInterviewPlanMapper {
* @param workflowStatus
* @return
*/
PageInfo<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(@Param("userId") String userId,
List<PartnerInterviewInfoDTO> getPartnerInterviewInfoList(@Param("userId") String userId,
@Param("workflowStage") String workflowStage ,
@Param("workflowStatus") String workflowStatus);

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

@@ -5,6 +5,7 @@ import com.cool.store.dto.partner.PartnerBlackListDTO;
import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO;
import com.cool.store.dto.partner.StageCountDTO;
import com.cool.store.entity.HyPartnerLineInfoDO;
import com.cool.store.vo.LineFollowHistoryVO;
import com.github.pagehelper.PageInfo;
import org.apache.ibatis.annotations.Param;
@@ -178,4 +179,11 @@ public interface HyPartnerLineInfoMapper {
* @return
*/
List<HyPartnerLineInfoDO> getHyPartnerLineInfoListByIds(@Param("lineIds") List<Long> lineIds);
/**
* 跟进历史 及删除状态为1的线索
* @param partnerId
* @return
*/
List<HyPartnerLineInfoDO> getLineFollowHistoryList(String partnerId);
}

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

@@ -189,6 +189,9 @@
<if test="keyword!=null and keyword!=''">
and area_path like concat('%',#{keyword},'%')
</if>
<if test="areaStatus!=null and areaStatus!=''">
and area_status = #{areaStatus}
</if>
<if test="filterData!=null and filterData==true">
and province_city_flag = 1
</if>

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

@@ -25,12 +25,16 @@
<result column="weakness" jdbcType="VARCHAR" property="weakness" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="pass_cause" jdbcType="VARCHAR" property="passCause" />
<result column="pass_time" jdbcType="TIMESTAMP" property="passTime" />
<result column="pass_user" jdbcType="VARCHAR" property="passUser" />
<result column="pass_certify-file" jdbcType="VARCHAR" property="passCertifyFile" />
</resultMap>
<sql id="Base_Column_List">
id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop,
want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp,
work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness,
create_time, update_time
create_time, update_time,pass_cause,pass_time,pass_user,pass_certify-file
</sql>
<select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
select

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

@@ -196,10 +196,11 @@
<select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO">
select
sum(if(interview_date=#{currentDate},1,0)) as currentDayInterviewCount,
sum(if(start_time>#{startTime} and #{endTime},1,0)) as lastSevenDayInterviewCount
ifnull(sum(if(interview_date=#{currentDate},1,0)),0) as currentDayInterviewCount,
ifnull(sum(if(start_time>#{startTime} and #{endTime},1,0)),0) as lastSevenDayInterviewCount
FROM hy_partner_interview_plan
where interviewer = #{userId}
and application_approved = 0
</select>
<select id="getInterviewPlanList" resultMap="BaseResultMap">
@@ -212,6 +213,7 @@
and interview_date = #{currentDate}
</if>
and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2))
and application_approved = 0
order by start_time
</where>
</select>
@@ -237,11 +239,8 @@
<if test="userId!=null and userId!=''">
and a.interviewer = #{userId}
</if>
<if test="workflowStage!=null and workflowStage!=''">
and a.workflow_stage= #{workflowStage}
</if>
<if test="workflowStatus!=null and workflowStatus!=''">
and a.workflow_status = #{workflowStatus}
and a.status = #{workflowStatus}
</if>
</where>
</select>

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

@@ -264,6 +264,7 @@
<select id="selectStagePendingCount" resultType="com.cool.store.dto.partner.StageCountDTO">
select
IFNULL(sum(if(workflow_stage=1 and workflow_status = 1,1,0)),0) as intentApplyApproveCount,
IFNULL(sum(if(workflow_stage=2 and workflow_status = 1,1,0)),0) as reservationInterviewCount,
IFNULL(sum(if(workflow_stage=3 and workflow_status = 3,1,0)),0) as qualifiedInterviewCount
from hy_partner_line_info
<where>
@@ -462,4 +463,12 @@
</where>
</select>
<select id="getLineFollowHistoryList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
FROM hy_partner_line_info
where deleted = 1
and partner_id = #{partner_id}
</select>
</mapper>