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-25 21:21:23 +08:00
parent b6e395dc9e 7e6ddefab1
commit 44805a4401
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,11 +277,11 @@
<select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO"> <select id="getInterviewCount" resultType="com.cool.store.dto.partner.SpecialDateRangeInterviewCountDTO">
select select
ifnull(sum(if(interview_date=#{currentDate},1,0)),0) as currentDayInterviewCount, ifnull(sum(if(start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2),1,0)),0) as currentDayInterviewCount,
ifnull(sum(if(start_time>#{startTime} and end_time <![CDATA[<]]> #{endTime},1,0)),0) as lastSevenDayInterviewCount ifnull(sum(if(start_time>#{startTime} and end_time <![CDATA[<]]> #{endTime},1,0)),0) as lastSevenDayInterviewCount
FROM hy_partner_interview_plan FROM hy_partner_interview_plan
where interviewer = #{userId} where interviewer = #{userId}
and application_approved = 0 and application_approved = 1
</select> </select>
<select id="getInterviewPlanList" resultMap="BaseResultMap"> <select id="getInterviewPlanList" resultMap="BaseResultMap">
@@ -294,7 +294,7 @@
and interview_date = #{currentDate} and interview_date = #{currentDate}
</if> </if>
and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2)) and (start_time>now() or (start_time<![CDATA[<]]>now() and room_status!=2))
and application_approved = 0 and application_approved = 1
order by start_time order by start_time
</where> </where>
</select> </select>

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

@@ -538,6 +538,7 @@
<select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO"> <select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">
SELECT partner_id, IFNULL(COUNT(1), 0) AS followCount SELECT partner_id, IFNULL(COUNT(1), 0) AS followCount
FROM hy_partner_line_info FROM hy_partner_line_info
where deleted = 1
GROUP BY partner_id; GROUP BY partner_id;
</select> </select>

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -64,7 +64,7 @@ public class DeskServiceImpl implements DeskService {
InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO(); InterviewScheduleInfoVO interviewScheduleInfoVO = new InterviewScheduleInfoVO();
//查询面试数量 //查询面试数量
String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_SEC);
String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(1), CoolDateUtils.DATE_FORMAT_SEC); String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(1), CoolDateUtils.DATE_FORMAT_SEC);
String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC); String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC);
SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime);

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -434,8 +434,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
if (hyIntendDevelopementMappingDO==null){ if (hyIntendDevelopementMappingDO==null){
return Boolean.FALSE; return Boolean.FALSE;
} }
//如果是私海线索 不需要重新分配招商经理 或者跟进次数大于1 //如果是私海线索 不需要重新分配招商经理 或者跟进次数大于等于1
if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isEmpty(lineFollowHistoryList)){ if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isNotEmpty(lineFollowHistoryList)){
return Boolean.FALSE; return Boolean.FALSE;
} }
if(HyPartnerLineInfo == null){ if(HyPartnerLineInfo == null){

5
coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
View File

@@ -61,7 +61,10 @@ public class PartnerController {
public ResponseResult<Boolean> getSubmitIntentionApplyFlag(){ public ResponseResult<Boolean> getSubmitIntentionApplyFlag(){
PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser(); PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser();
PartnerBaseInfoVO partnerBaseInfoVO = hyPartnerBaseInfoService.queryPartnerBaseInfo(userInfoVO.getPartnerId(), userInfoVO.getPartnerLineId()); PartnerBaseInfoVO partnerBaseInfoVO = hyPartnerBaseInfoService.queryPartnerBaseInfo(userInfoVO.getPartnerId(), userInfoVO.getPartnerLineId());
Boolean submitFlag = partnerBaseInfoVO.getStatus() > Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode()); Boolean submitFlag = false;
if(partnerBaseInfoVO.getStatus() != null){
submitFlag = partnerBaseInfoVO.getStatus() > Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode());
}
return ResponseResult.success(submitFlag); return ResponseResult.success(submitFlag);
} }