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:
pserimal
2023-06-21 17:58:59 +08:00
parent 520a5d60ae d8ba4c46c9
commit ca35d4082d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java
View File

@@ -16,9 +16,9 @@ import java.util.Date;
public class LineFollowHistoryVO {
@ApiModelProperty("开始跟进时间")
private Date startTime;
private String startTime;
@ApiModelProperty("结束跟进时间")
private Date closeTime;
private String closeTime;
@ApiModelProperty("结束原因")
private String closeCause;

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

@@ -397,8 +397,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
lineFollowHistoryList.forEach(x->{
LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO();
lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason());
lineFollowHistoryVO.setCloseTime(x.getCloseTime());
lineFollowHistoryVO.setStartTime(x.getCreateTime());
lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC));
lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC));
result.add(lineFollowHistoryVO);
});
return result;