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 984c5c7a8..add5140e9 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 @@ -56,7 +56,7 @@ public class LineInfoDAO { return lineInfoMapper.updateByPrimaryKeySelective(param); } - public Integer updateWorkflowStage(Long lineId, WorkflowSubStageEnum workflowSubStage, WorkflowSubStageStatusEnum workflowSubStageStatus) { + public Integer updateWorkflowStage(Long lineId, WorkflowSubStageEnum workflowSubStage, WorkflowSubStageStatusEnum workflowSubStageStatus,String userId) { if(Objects.isNull(workflowSubStageStatus)){ log.info("更新线索阶段,子阶段 和 子阶段状态不能同时为空"); throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); @@ -66,6 +66,9 @@ public class LineInfoDAO { if(Objects.nonNull(workflowSubStage)){ lineInfo.setWorkflowSubStage(workflowSubStage.getCode()); } + if(StringUtils.isNotEmpty(userId)){ + lineInfo.setUpdateUserId(userId); + } lineInfo.setWorkflowSubStageStatus(workflowSubStageStatus.getCode()); return lineInfoMapper.updateByPrimaryKeySelective(lineInfo); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java index 6009370c4..f0cbd15ad 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AuditStatusMapper.java @@ -1,9 +1,22 @@ package com.cool.store.mapper; import com.cool.store.entity.AuditStatusDO; +import com.cool.store.response.CheckListResponse; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.Date; +import java.util.List; + @org.apache.ibatis.annotations.Mapper public interface AuditStatusMapper extends Mapper { + List checkList(@Param("keyWord") String partnerNameOrPhone, + @Param("startTime") String startTime, + @Param("endTime") String endTime, + @Param("region") String region, + @Param("checkStatus") Integer checkStatus, + @Param("checkStage") Integer checkStage, + @Param("pageNum") Integer pageNum, + @Param("pageSize") Integer pageSize); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml index 1457e76d1..56a75ad57 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml @@ -28,4 +28,95 @@ update_time, audit_stage + + \ 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 0cb0f55ab..806624594 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -314,7 +314,7 @@ select * from xfsg_line_info - where deleted = 0 + where deleted = 0 and line_status = 1 - and first_interviewer = #{interviewId} + and investment_manager = #{interviewId} - and second_interviewer = #{interviewId} + and investment_manager = #{interviewId} @@ -346,15 +346,15 @@