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

11

Browse Source
This commit is contained in:
苏竹红
2023-06-21 19:33:17 +08:00
parent c633e7faea
commit ef69f20f36
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,7 +299,7 @@
a.investment_manager as investmentManager,
b.user_portrait as user_portrait,
b.id as partnerBaseInfoId,
b.pass_reason as passReason,
b.pass_reason as passCause,
b.certify_file as certifyFile,
b.pass_time as passTime,
b.pass_user_id as passUserId,

4
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java
View File

@@ -74,4 +74,8 @@ public class HyPartnerBaseInfoDO implements Serializable {
@ApiModelProperty("更新时间")
private Date updateTime;
private Date passTime;
private String passUserId;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
View File

@@ -58,7 +58,7 @@ public class PartnerLineInfoAndBaseInfoVO {
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
private String passTime;
@ApiModelProperty("通过人名称")
private String passUserName;

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

@@ -258,6 +258,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
if (CollectionUtils.isNotEmpty(closeFollowRequest.getCertifyFile())){
hyPartnerLineInfoDO.setCertifyFile(JSONObject.toJSONString(closeFollowRequest.getCertifyFile()));
}
HyPartnerBaseInfoDO hy = hyPartnerBaseInfoDAO.getByPartnerLineId(hyPartnerLineInfoDO.getId());
hy.setPassReason(closeFollowRequest.getPassReason());
hy.setPassTime(new Date());
hy.setPassUserId(userId);
hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hy);
}
//拒绝
@@ -560,7 +565,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
}
partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId());
partnerLineInfoAndBaseInfoVO.setPassTime(partnerLineInfoAndBaseInfoDTO.getPassTime());
partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(partnerLineInfoAndBaseInfoDTO.getPassTime(),CoolDateUtils.DATE_FORMAT_SEC));
return partnerLineInfoAndBaseInfoVO;
}