From e3dee054c2834ff9cbb9c79eed5105755f4dd6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 27 Mar 2024 15:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=20=E6=84=8F?= =?UTF-8?q?=E5=90=91=E5=8A=A0=E7=9B=9F+=E9=82=80=E7=BA=A6=E9=9D=A2?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/WorkflowSubStageStatusEnum.java | 4 +- .../com/cool/store/dao/HyPartnerLabelDAO.java | 33 ++++ .../java/com/cool/store/dao/LineInfoDAO.java | 10 ++ .../com/cool/store/dao/LineInterviewDAO.java | 9 ++ .../com/cool/store/mapper/LineInfoMapper.java | 10 ++ .../store/mapper/LineInterviewMapper.java | 10 ++ .../main/resources/mapper/LineInfoMapper.xml | 13 ++ .../resources/mapper/LineInterviewMapper.xml | 9 ++ .../java/com/cool/store/vo/BaseInfoVO.java | 55 +++++++ .../com/cool/store/vo/LabelBaseInfoVO.java | 22 +++ .../cool/store/vo/desk/IntendPendingVO.java | 25 +++ .../store/vo/desk/InterviewPendingVO.java | 28 ++++ .../com/cool/store/service/DeskService.java | 34 +++++ .../store/service/impl/DeskServiceImpl.java | 143 ++++++++++++++++++ .../impl/JoinIntentionServiceImpl.java | 2 +- .../com/cool/store/utils/poi/DateUtils.java | 4 + .../store/controller/webb/DeskController.java | 51 +++++++ 17 files changed, 460 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLabelDAO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/LabelBaseInfoVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/desk/InterviewPendingVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java index 608110a4a..61aa9ea44 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java @@ -10,11 +10,12 @@ public enum WorkflowSubStageStatusEnum { //意向申请 INTENT_0(0,"待提交"), INTENT_5(5,"待审核"), + INTENT_7(7,"未通过"), //邀约面谈 INVITING_INTERVIEWS_10(10,"待预约"), INVITING_INTERVIEWS_15(15,"待面谈"), - INVITING_INTERVIEWS_20(20,"面谈未通过"), + INVITING_INTERVIEWS_20(20,"待审核"), //一审面试 FIRST_INTERVIEWS_25(25,"待预约"), @@ -31,6 +32,7 @@ public enum WorkflowSubStageStatusEnum { //签署意向协议 SIGN_INTENT_AGREEMENT_60(60,"待补充"), + SIGN_INTENT_AGREEMENT_63(63,"待审核"), SIGN_INTENT_AGREEMENT_65(65,"不通过"), SIGN_INTENT_AGREEMENT_70(70,"待提交"), SIGN_INTENT_AGREEMENT_75(75,"待OA审核"), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLabelDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLabelDAO.java new file mode 100644 index 000000000..491227b41 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLabelDAO.java @@ -0,0 +1,33 @@ +package com.cool.store.dao; + +import com.cool.store.entity.HyPartnerLabelDO; +import com.cool.store.mapper.HyPartnerLabelMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/3/26 16:39 + * @Version 1.0 + */ +@Repository +public class HyPartnerLabelDAO { + + @Resource + HyPartnerLabelMapper hyPartnerLabelMapper; + + public List listByIds(List ids ){ + if (CollectionUtils.isEmpty(ids)){ + return null; + } + return hyPartnerLabelMapper.getLabelListByIds(ids); + } + + + + + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index d9dc5abfc..11f717720 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -8,9 +8,11 @@ import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LineInfoMapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.List; import java.util.Objects; /** @@ -72,4 +74,12 @@ public class LineInfoDAO { } return null; } + + public List listByInvestmentManager(String investmentManagerUserId,Integer subStageStatus) { + if (StringUtils.isBlank(investmentManagerUserId)){ + return null; + } + List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus); + return lineInfo; + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java index 8954c96f7..280a5d0ff 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInterviewDAO.java @@ -8,9 +8,11 @@ import com.cool.store.request.LineInterviewPageRequest; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.List; import java.util.Objects; /** @@ -32,6 +34,13 @@ public class LineInterviewDAO { return lineInterviewMapper.getInterviewInfo(lineId, interviewType.getCode()); } + public List getInterviewByLindIds(List lineIds, InterviewTypeEnum interviewType){ + if(CollectionUtils.isEmpty(lineIds) || Objects.isNull(interviewType)){ + return null; + } + return lineInterviewMapper.getInterviewByLindIds(lineIds, interviewType.getCode()); + } + public Integer updateInterviewInfo(LineInterviewDO interview){ return lineInterviewMapper.updateByPrimaryKeySelective(interview); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index 872adf87b..977be27aa 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -1,11 +1,21 @@ package com.cool.store.mapper; import com.cool.store.entity.LineInfoDO; +import com.cool.store.enums.WorkflowSubStageStatusEnum; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface LineInfoMapper extends Mapper { LineInfoDO getByPartnerId(@Param("partnerId") String partnerId); LineInfoDO getByLineId(@Param("lineId") Long lineId); + + /** + * 查询招商经理待处理数据 + * @param investmentManagerUserId + * @return + */ + List listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("code") Integer code); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java index 391833650..20d0f82c1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInterviewMapper.java @@ -7,6 +7,8 @@ import com.github.pagehelper.Page; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface LineInterviewMapper extends Mapper { /** @@ -17,6 +19,14 @@ public interface LineInterviewMapper extends Mapper { */ LineInterviewDO getInterviewInfo(@Param("lineId") Long lineId, @Param("interviewType") Integer interviewType); + /** + * getInterviewByLindIds + * @param lineIds + * @param interviewType + * @return + */ + List getInterviewByLindIds(@Param("lineIds") List lineIds, @Param("interviewType") Integer interviewType); + /** * 获取面试分页 * @param request diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 69ca0616c..0af23e631 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -38,4 +38,17 @@ select * from xfsg_line_info where id = #{lineId} and deleted = 0 + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml index cd04de858..ee269f3d5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml @@ -30,6 +30,15 @@ select * from xfsg_line_interview where line_id = #{lineId} and interview_type = #{interviewType} and deleted = '0' + +