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-26 03:22:35 +08:00
parent 16c94798f3 44805a4401
commit 05becc1fe0
4 changed files with 6 additions and 4 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

@@ -270,11 +270,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">
@@ -287,7 +287,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);

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
View File

@@ -213,6 +213,7 @@ public class FlowServiceImpl implements FlowService {
} else if ("CANCELED".equals(request.getSequenceStatus())) { } else if ("CANCELED".equals(request.getSequenceStatus())) {
interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7); interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7);
} }
log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request));
} }