suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加日志

Browse Source
This commit is contained in:
苏竹红
2023-06-27 21:40:35 +08:00
parent 1a993548ed
commit d09d317134
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -58,6 +58,7 @@ public enum ErrorCodeEnum {
PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null), PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null),
INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null), INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null),
INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败！", null), INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败！", null),
PUBLIC_LINE_NOT_OPERATE(500008, "公海线索不允许操作！", null),
INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null), INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null), DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),

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

@@ -568,7 +568,7 @@
<select id="getLineFollowHistoryList" resultMap="BaseResultMap"> <select id="getLineFollowHistoryList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include> SELECT <include refid="Base_Column_List"></include>
FROM hy_partner_line_info FROM hy_partner_line_info
where (deleted = 1 or (deleted=0 and line_status=0)) where (deleted = 1 or (deleted=0 and line_status=0 and close_time is not null))
and partner_id = #{partner_id} and partner_id = #{partner_id}
</select> </select>

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

@@ -295,9 +295,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
newHyPartnerLineInfoDO.setLineStatus(status); newHyPartnerLineInfoDO.setLineStatus(status);
hyPartnerLineInfoDAO.insertSelective(newHyPartnerLineInfoDO); hyPartnerLineInfoDAO.insertSelective(newHyPartnerLineInfoDO);
HyPartnerBaseInfoDO oldHyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(lineId);
HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO();
hyPartnerBaseInfoDO.setPartnerId(hyPartnerLineInfo.getPartnerId()); hyPartnerBaseInfoDO.setPartnerId(hyPartnerLineInfo.getPartnerId());
hyPartnerBaseInfoDO.setPartnerLineId(newHyPartnerLineInfoDO.getId()); hyPartnerBaseInfoDO.setPartnerLineId(newHyPartnerLineInfoDO.getId());
hyPartnerBaseInfoDO.setUserPortrait(oldHyPartnerBaseInfoDO.getUserPortrait());
hyPartnerBaseInfoDAO.insertSelective(hyPartnerBaseInfoDO); hyPartnerBaseInfoDAO.insertSelective(hyPartnerBaseInfoDO);
//添加日志 //添加日志
@@ -319,6 +322,9 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
if (hyPartnerLineInfoDO==null){ if (hyPartnerLineInfoDO==null){
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
} }
if (hyPartnerLineInfoDO.getLineStatus()==0){
throw new ServiceException(ErrorCodeEnum.PUBLIC_LINE_NOT_OPERATE);
}
String oldWorkflowStage = hyPartnerLineInfoDO.getWorkflowStage(); String oldWorkflowStage = hyPartnerLineInfoDO.getWorkflowStage();
String oldWorkflowStatus = hyPartnerLineInfoDO.getWorkflowStatus(); String oldWorkflowStatus = hyPartnerLineInfoDO.getWorkflowStatus();
//通过 //通过
@@ -508,7 +514,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
List<LineFollowHistoryVO> result = new ArrayList<>(); List<LineFollowHistoryVO> result = new ArrayList<>();
lineFollowHistoryList.forEach(x->{ lineFollowHistoryList.forEach(x->{
LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO(); LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO();
lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason()); lineFollowHistoryVO.setCloseCause(x.getRejectRealReason());
lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC)); lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC));
lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC)); lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC));
result.add(lineFollowHistoryVO); result.add(lineFollowHistoryVO);