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 01/12] =?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' + + + select + + from xfsg_lease_base_info + where line_id = #{lineId} + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java index 212b07ccd..7887400fa 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LeaseBaseInfoDO.java @@ -1,5 +1,6 @@ package com.cool.store.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -19,9 +20,9 @@ public class LeaseBaseInfoDO { private Date experienceStartTime; private Date experienceEndTime; - +@ApiModelProperty("体验状态 0完成 1放弃") private Integer experienceStatus; - +@ApiModelProperty("放弃原因") private String abandonCause; private Date createTime; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java index 574e3d9dd..886287d38 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/TrainingExperienceService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.entity.LeaseBaseInfoDO; import com.cool.store.request.TrainingExperienceDistributionRequest; public interface TrainingExperienceService { @@ -18,4 +19,5 @@ public interface TrainingExperienceService { */ void experienceStatusChange(Long lineId, Integer status, String abandonCause); + LeaseBaseInfoDO getTrainingExperience(Long lineId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 579b87de4..cf62fe7b1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -56,4 +56,10 @@ public class TrainingExperienceServiceImpl implements TrainingExperienceService } } + + @Override + public LeaseBaseInfoDO getTrainingExperience(Long lineId) { + LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); + return leaseBaseInfoDO; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java index dacaaf3cd..bb261653b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java @@ -1,5 +1,6 @@ package com.cool.store.controller.webb; +import com.cool.store.entity.LeaseBaseInfoDO; import com.cool.store.enums.ExperienceStatusEnum; import com.cool.store.request.TrainingExperienceDistributionRequest; import com.cool.store.response.ResponseResult; @@ -28,4 +29,10 @@ public class PCTrainingExperienceController { return ResponseResult.success(trainingExperienceService.distribution(request)); } + @ApiOperation("查询实训体验") + @GetMapping("/get") + public ResponseResult getTrainingExperience(@RequestParam("lineId") Long lineId) { + return ResponseResult.success(trainingExperienceService.getTrainingExperience(lineId)); + } + } From 35a1cdd4264424bbe32de95a420693b84ca16032 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 27 Mar 2024 17:25:15 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E7=A7=81=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/JoinIntentionServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index fb340c135..c895f9363 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -55,6 +55,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt if (Objects.isNull(lineInfoParam)) { throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); } + //todo 目前写死为进入私海 + lineInfoParam.setLineStatus(1); lineInfoMapper.insertOrUpdate(lineInfoParam); MemberQuestionDO memberQuestionDO = request.toMemberQuestionDO(); From 6be24782429fda187cb55cb07253418100cb0322 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 27 Mar 2024 17:46:13 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=A4=A7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/JoinIntentionServiceImpl.java | 3 +++ .../store/controller/webb/PCIntentAgreementController.java | 7 ++----- .../controller/webc/MiniIntentAgreementController.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index c895f9363..f7852c67d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -6,6 +6,7 @@ import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.MemberQuestionDO; import com.cool.store.entity.PartnerBaseInfoDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.exception.ServiceException; @@ -51,6 +52,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt } //更改线索流程子状态为【待审核】 LineInfoDO lineInfoParam = request.toLineInfoDO(); + lineInfoParam.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); + lineInfoParam.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode()); lineInfoParam.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_5.getCode()); if (Objects.isNull(lineInfoParam)) { throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java index ea6e6f1a9..02979f2db 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java @@ -6,10 +6,7 @@ import com.cool.store.service.IntentAgreementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -22,7 +19,7 @@ public class PCIntentAgreementController { @Resource IntentAgreementService intentAgreementService; - @PostMapping(path = "/get") + @GetMapping(path = "/get") @ApiOperation("查询意向协议信息") public ResponseResult getMiniIntentAgreement( @RequestParam(value = "partnerId", required = false) String partnerId, diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniIntentAgreementController.java index 651dc505b..533731ffd 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniIntentAgreementController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniIntentAgreementController.java @@ -28,7 +28,7 @@ public class MiniIntentAgreementController { return ResponseResult.success(resp); } - @PostMapping(path = "/get") + @GetMapping(path = "/get") @ApiOperation("查询意向协议信息") public ResponseResult getMiniIntentAgreement( @RequestParam(value = "partnerId",required = false) String partnerId, From e4b8891c0baec9821eef5be579966fa7cc257c40 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 18:07:28 +0800 Subject: [PATCH 09/12] =?UTF-8?q?PC=20=E7=BA=BF=E7=B4=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E6=88=91=E7=9A=84=E7=BA=BF=E7=B4=A2=20=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/LineInfoDAO.java | 6 ++ .../com/cool/store/mapper/LineInfoMapper.java | 10 +++ .../main/resources/mapper/LineInfoMapper.xml | 37 +++++++++-- .../com/cool/store/entity/LineInfoDO.java | 4 +- .../cool/store/request/LineListRequest.java | 32 +++++++++ .../java/com/cool/store/vo/BaseInfoVO.java | 3 + .../java/com/cool/store/vo/LineInfoVO.java | 6 +- .../java/com/cool/store/vo/LineListVO.java | 36 ++++++++++ .../com/cool/store/service/DeskService.java | 21 ++++++ .../com/cool/store/service/LineService.java | 11 ++++ .../store/service/impl/DeskServiceImpl.java | 12 ++-- .../store/service/impl/LineServiceImpl.java | 57 ++++++++++++++++ .../controller/webb/LineInfoController.java | 66 +++++++++++++++++++ 13 files changed, 286 insertions(+), 15 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java 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 11f717720..f25179aa3 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 @@ -7,8 +7,10 @@ import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LineInfoMapper; +import com.cool.store.request.LineListRequest; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -82,4 +84,8 @@ public class LineInfoDAO { List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus); return lineInfo; } + public List lineList(LineListRequest lineListRequest, String userId, List wantShopAreaIds) { + List lineInfo = lineInfoMapper.lineList(lineListRequest,userId,wantShopAreaIds); + return lineInfo; + } } 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 b74479876..3770cd634 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 @@ -2,6 +2,7 @@ package com.cool.store.mapper; import com.cool.store.entity.LineInfoDO; import com.cool.store.enums.WorkflowSubStageStatusEnum; +import com.cool.store.request.LineListRequest; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -19,5 +20,14 @@ public interface LineInfoMapper extends Mapper { */ List listByInvestmentManager(@Param("investmentManagerUserId") String investmentManagerUserId, @Param("code") Integer code); + /** + * 我的线索列表 + * @param lineListRequest + * @return + */ + List lineList(@Param("request") LineListRequest lineListRequest, + @Param("userId") String userId, + @Param("wantShopAreaIds") List wantShopAreaIds); + void insertOrUpdate(@Param("param") LineInfoDO lineInfoParam); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 7f10c281e..14cf41876 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -16,13 +16,13 @@ - + - + @@ -93,8 +93,8 @@ user_portrait, - - is_join, + + join_status, line_status, @@ -250,4 +250,33 @@ + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java index b7dd86a50..37851f129 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java @@ -123,8 +123,8 @@ public class LineInfoDO { /** * 是否是加盟商：0.否 1.是 */ - @Column(name = "is_join") - private Boolean isJoin; + @Column(name = "0-线索 1-蓄水池 2-加盟商") + private Boolean joinStatus; /** * 0.公海 1.私海 2黑名单 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java new file mode 100644 index 000000000..02dafe133 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LineListRequest.java @@ -0,0 +1,32 @@ +package com.cool.store.request; + +import com.cool.store.common.PageBasicInfo; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2024/3/27 16:32 + * @Version 1.0 + */ +@Data +public class LineListRequest extends PageBasicInfo { + + @ApiModelProperty("线索姓名") + private String userName; + @ApiModelProperty("线索手机号") + private String mobile; + @ApiModelProperty("线索子阶段") + private Integer workflowSubStage; + @ApiModelProperty("线索创建时间_开始") + private String createTimeStart; + @ApiModelProperty("线索创建时间_结束") + private String createTimeEnd; + @ApiModelProperty("意向区域ID") + private Integer wantShopAreaId; + @ApiModelProperty("线索来源") + private Integer lineSource; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java index 088f0d046..3df61941b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java @@ -31,6 +31,8 @@ public class BaseInfoVO { @ApiModelProperty("线索标签") private List userPortraitList; + private Integer workflowSubStage; + @ApiModelProperty("子阶段状态") private Integer workflowSubStageStatus; @@ -44,6 +46,7 @@ public class BaseInfoVO { this.partnerId = baseInfoVO.getPartnerId(); this.username = baseInfoVO.getUsername(); this.mobile = baseInfoVO.getMobile(); + this.workflowSubStage = baseInfoVO.getWorkflowSubStage(); this.wantShopAreaName = baseInfoVO.getWantShopAreaName(); this.userPortraitList = baseInfoVO.getUserPortraitList(); this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus(); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java index 5e53f838f..dd30c2e02 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java @@ -149,9 +149,9 @@ public class LineInfoVO { /** * 是否是加盟商：0.否 1.是 */ - @Column(name = "is_join") - @ApiModelProperty("是否是加盟商：0.否 1.是") - private Boolean isJoin; + @Column(name = "join_status") + @ApiModelProperty("0-线索 1-蓄水池 2-加盟商") + private Boolean joinStatus; /** * 0.公海 1.私海 2黑名单 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java new file mode 100644 index 000000000..8d5907466 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java @@ -0,0 +1,36 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2024/3/27 16:13 + * @Version 1.0 + */ +@Data +public class LineListVO extends BaseInfoVO{ + + @ApiModelProperty("招商经理名称") + private String investmentManagerUserName; + + @ApiModelProperty("招商经理名称") + private String lineSourceName; + + @ApiModelProperty("招商经理名称") + private String createTime; + + @ApiModelProperty("招商经理名称") + private String updateTime; + + @ApiModelProperty("招商经理名称") + private String updateUserName; + + public LineListVO(){} + + public LineListVO(BaseInfoVO baseInfoVO) { + super(baseInfoVO); + } + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java index 450781bc1..15b66dea5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java @@ -1,9 +1,15 @@ package com.cool.store.service; +import com.cool.store.entity.HyPartnerLabelDO; +import com.cool.store.entity.LineInfoDO; +import com.cool.store.vo.BaseInfoVO; import com.cool.store.vo.desk.IntendPendingVO; import com.cool.store.vo.desk.InterviewPendingVO; import com.github.pagehelper.PageInfo; +import java.util.List; +import java.util.Map; + /** * @Author suzhuhong * @Date 2024/3/26 15:15 @@ -30,5 +36,20 @@ public interface DeskService { */ PageInfo interviewPendingList(Integer pageNum, Integer pageSize,String userId); + /** + * convertToBaseInfoVO + * @param lineInfoDO + * @param userPortraitMap + * @param wantShopAreaMap + * @return + */ + BaseInfoVO convertToBaseInfoVO(LineInfoDO lineInfoDO, Map userPortraitMap, Map wantShopAreaMap); + + /** + * getUserPortraitMap + * @param lineInfoDOList + * @return + */ + Map getUserPortraitMap(List lineInfoDOList); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index 354b40075..0dc5fffa8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -1,6 +1,10 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.request.LineListRequest; import com.cool.store.vo.LineInfoVO; +import com.cool.store.vo.LineListVO; +import com.github.pagehelper.PageInfo; /** * @Author suzhuhong @@ -18,6 +22,13 @@ public interface LineService { LineInfoVO getLineInfo(Long lineId); + /** + * 我的线索 团队线索 + * @param lineListRequest + * @param loginUserInfo + * @return + */ + PageInfo getLineList(LineListRequest lineListRequest, LoginUserInfo loginUserInfo,Boolean teamFlag); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index f68b38d2d..c92e67b20 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -51,8 +51,7 @@ public class DeskServiceImpl implements DeskService { PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); - List hyOpenAreaInfoDOList = hyOpenAreaInfoDAO.selectByIds(wantShopAreaIds); - Map wantShopAreaMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName, (k1, k2) -> k1)); + Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); List list = new ArrayList<>(); lineInfoDOS.forEach(x->{ BaseInfoVO baseInfoVO = convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap); @@ -72,8 +71,7 @@ public class DeskServiceImpl implements DeskService { PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); - List hyOpenAreaInfoDOList = hyOpenAreaInfoDAO.selectByIds(wantShopAreaIds); - Map wantShopAreaMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName, (k1, k2) -> k1)); + Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); List lineIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getId() != null).map(LineInfoDO::getId).collect(Collectors.toList()); List interviewByLindIds = lineInterviewDAO.getInterviewByLindIds(lineIds, InterviewTypeEnum.MEET); Map interviewDOMap = interviewByLindIds.stream().collect(Collectors.toMap(LineInterviewDO::getLineId, x -> x, (k1, k2) -> k1)); @@ -100,7 +98,8 @@ public class DeskServiceImpl implements DeskService { * @param wantShopAreaMap * @return */ - private BaseInfoVO convertToBaseInfoVO(LineInfoDO lineInfoDO, Map userPortraitMap, Map wantShopAreaMap){ + @Override + public BaseInfoVO convertToBaseInfoVO(LineInfoDO lineInfoDO, Map userPortraitMap, Map wantShopAreaMap){ BaseInfoVO baseInfoVO = new BaseInfoVO(); BeanUtil.copyProperties(lineInfoDO, baseInfoVO); baseInfoVO.setLineId(lineInfoDO.getId()); @@ -128,7 +127,8 @@ public class DeskServiceImpl implements DeskService { * @param lineInfoDOList * @return */ - private Map getUserPortraitMap(List lineInfoDOList){ + @Override + public Map getUserPortraitMap(List lineInfoDOList){ List libelIds = new ArrayList<>(); lineInfoDOList.stream().forEach(x->{ if (StringUtil.isNotEmpty(x.getUserPortrait())){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 500e69382..08a394974 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -1,15 +1,33 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.EnterpriseUserDAO; +import com.cool.store.dao.HyOpenAreaInfoDAO; +import com.cool.store.dao.HyPartnerUserChannelDAO; import com.cool.store.dao.LineInfoDAO; +import com.cool.store.entity.EnterpriseUserDO; +import com.cool.store.entity.HyOpenAreaInfoDO; +import com.cool.store.entity.HyPartnerLabelDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.request.LineListRequest; +import com.cool.store.service.DeskService; import com.cool.store.service.LineService; +import com.cool.store.utils.poi.DateUtils; +import com.cool.store.vo.BaseInfoVO; import com.cool.store.vo.LineInfoVO; +import com.cool.store.vo.LineListVO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @Author suzhuhong @@ -21,6 +39,14 @@ public class LineServiceImpl implements LineService { @Resource LineInfoDAO lineInfoDAO; + @Resource + HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + @Resource + DeskService deskService; + @Resource + HyPartnerUserChannelDAO hyPartnerUserChannelDAO; + @Resource + EnterpriseUserDAO enterpriseUserDAO; @Override public LineInfoVO getLineInfo(Long lineId) { @@ -33,4 +59,35 @@ public class LineServiceImpl implements LineService { BeanUtil.copyProperties(lineInfo,result); return result; } + + @Override + public PageInfo getLineList(LineListRequest lineListRequest, LoginUserInfo loginUserInfo,Boolean teamFlag) { + //确定意向区域 + PageHelper.startPage(lineListRequest.getPageNum(), lineListRequest.getPageSize()); + List lineInfoDOS = lineInfoDAO.lineList(lineListRequest, loginUserInfo.getUserId(), null); + PageInfo page = new PageInfo(lineInfoDOS); + Map userPortraitMap = deskService.getUserPortraitMap(lineInfoDOS); + List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); + Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaIds); + List lineSourceIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getLineSource() != null).map(LineInfoDO::getLineSource).collect(Collectors.toList()); + Map channelMapByIds = hyPartnerUserChannelDAO.getChannelMapByIds(lineSourceIds); + List userIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getInvestmentManager() != null).map(LineInfoDO::getInvestmentManager).collect(Collectors.toList()); + userIds.addAll(lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getCreateUserId() != null).map(LineInfoDO::getCreateUserId).collect(Collectors.toList())); + userIds.addAll(lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getUpdateUserId() != null).map(LineInfoDO::getUpdateUserId).collect(Collectors.toList())); + Map userNameMap = enterpriseUserDAO.getUserNameMap(userIds); + + List result = new ArrayList<>(); + lineInfoDOS.forEach(x->{ + BaseInfoVO baseInfoVO = deskService.convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap); + LineListVO lineListVO = new LineListVO(baseInfoVO); + lineListVO.setCreateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getCreateTime())); + lineListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime())); + lineListVO.setLineSourceName(channelMapByIds.get(x.getLineSource())); + lineListVO.setInvestmentManagerUserName(userNameMap.get(x.getInvestmentManager())); + lineListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId())); + result.add(lineListVO); + }); + page.setList(result); + return page; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java new file mode 100644 index 000000000..df361c596 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -0,0 +1,66 @@ +package com.cool.store.controller.webb; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.request.LineListRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.LineService; +import com.cool.store.vo.LineInfoVO; +import com.cool.store.vo.LineListVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @Author suzhuhong + * @Date 2024/3/27 15:57 + * @Version 1.0 + */ +@RestController +@RequestMapping("/pc/line") +@Api(tags = "PC线索信息") +@Slf4j +public class LineInfoController { + + @Resource + LineService lineService; + + @ApiOperation("查询线索详情") + @GetMapping("/getLineDetail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索id", required = true) + }) + public ResponseResult getLineInfo(@RequestParam("lineId")Long lineId) { + return ResponseResult.success(lineService.getLineInfo(lineId)); + } + + + @ApiOperation("我的线索") + @PostMapping("/getMyLineList") + public ResponseResult> getLineList(@RequestBody LineListRequest lineListRequest) { + LoginUserInfo user = CurrentUserHolder.getUser(); + user.setUserId("055740241221153440"); + return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.FALSE)); + } + + + @ApiOperation("团队线索") + @PostMapping("/getTeamLineList") + public ResponseResult> getTeamLineList(@RequestBody LineListRequest lineListRequest) { + LoginUserInfo user = CurrentUserHolder.getUser(); + user.setUserId("055740241221153440"); + return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.TRUE)); + } + + + + + + +} From 266d74d39f63c65875bf82e7b17031189a67a37c Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 27 Mar 2024 18:20:13 +0800 Subject: [PATCH 10/12] post --- .../TrainingExperienceChangeRequest.java | 16 ++++++++++++++++ .../webc/MiniTrainingExperienceController.java | 18 ++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceChangeRequest.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceChangeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceChangeRequest.java new file mode 100644 index 000000000..b220ef79d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceChangeRequest.java @@ -0,0 +1,16 @@ +package com.cool.store.request; + +import com.cool.store.enums.ExperienceStatusEnum; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class TrainingExperienceChangeRequest { + @ApiModelProperty("实训体验状态 DONE:完成 ABANDON:放弃") + private ExperienceStatusEnum statusEnum; + @ApiModelProperty("线索id") + private Long lineId; + @ApiParam(value = "放弃原因，状态为ABANDON才填写") + private String abandonCause; +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java index f31af7a41..31c004958 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java @@ -1,14 +1,15 @@ package com.cool.store.controller.webc; -import com.cool.store.enums.ExperienceStatusEnum; -import com.cool.store.request.TrainingExperienceDistributionRequest; +import com.cool.store.request.TrainingExperienceChangeRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.TrainingExperienceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -22,12 +23,9 @@ public class MiniTrainingExperienceController { TrainingExperienceService trainingExperienceService; @ApiOperation("实训体验状态变更") - @GetMapping("/experience/{status}") - public ResponseResult experienceStatusChange(@ApiParam(value = "实训体验状态 DONE:完成 ABANDON:放弃") @PathVariable(value = "status") ExperienceStatusEnum statusEnum, - @ApiParam(value = "线索id")@RequestParam(value = "lineId") Long lineId, - @ApiParam(value = "放弃原因，状态为ABANDON才填写")@RequestParam(value = "abandonCause",required = false)String abandonCause) { - - trainingExperienceService.experienceStatusChange(lineId,statusEnum.getExperienceStatus(),abandonCause); + @PostMapping("/experience/change") + public ResponseResult experienceStatusChange(@RequestBody TrainingExperienceChangeRequest request) { + trainingExperienceService.experienceStatusChange(request.getLineId(), request.getStatusEnum().getExperienceStatus(), request.getAbandonCause()); return ResponseResult.success(); } From 06fbd88fb46e8db99b2b88b52e5cff89a1a5c99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 28 Mar 2024 09:36:31 +0800 Subject: [PATCH 11/12] =?UTF-8?q?PC=20=E7=BA=BF=E7=B4=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E6=88=91=E7=9A=84=E7=BA=BF=E7=B4=A2=20=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=E7=BA=BF=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/entity/LineInfoDO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java index 37851f129..37decb2df 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java @@ -123,7 +123,7 @@ public class LineInfoDO { /** * 是否是加盟商：0.否 1.是 */ - @Column(name = "0-线索 1-蓄水池 2-加盟商") + @Column(name = "join_status") private Boolean joinStatus; /** From 25a797c6a3816f9fc08da1ea3e1d99db947834b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 28 Mar 2024 12:14:10 +0800 Subject: [PATCH 12/12] bug --- .../src/main/resources/mapper/LineInfoMapper.xml | 2 +- .../src/main/java/com/cool/store/vo/LineListVO.java | 8 ++++---- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 14cf41876..bfa813dcd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -267,7 +267,7 @@ and want_shop_area_id = #{request.wantShopAreaId} - and line_source #{request.lineSource} + and line_source = #{request.lineSource} and create_time between #{request.createTimeStart} and #{request.createTimeEnd} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java index 8d5907466..44467dc95 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java @@ -14,16 +14,16 @@ public class LineListVO extends BaseInfoVO{ @ApiModelProperty("招商经理名称") private String investmentManagerUserName; - @ApiModelProperty("招商经理名称") + @ApiModelProperty("线索来源名称") private String lineSourceName; - @ApiModelProperty("招商经理名称") + @ApiModelProperty("创建时间") private String createTime; - @ApiModelProperty("招商经理名称") + @ApiModelProperty("更新时间") private String updateTime; - @ApiModelProperty("招商经理名称") + @ApiModelProperty("更新人名称") private String updateUserName; public LineListVO(){} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index c92e67b20..568b9bad1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -21,6 +21,7 @@ import com.cool.store.vo.desk.IntendPendingVO; import com.cool.store.vo.desk.InterviewPendingVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -137,6 +138,9 @@ public class DeskServiceImpl implements DeskService { } }); List hyPartnerLabelDOS = hyPartnerLabelDAO.listByIds(libelIds); + if (CollectionUtils.isEmpty(hyPartnerLabelDOS)){ + return new HashMap<>(); + } return hyPartnerLabelDOS.stream().collect(Collectors.toMap(HyPartnerLabelDO::getId, x -> x)); }