mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成合同

Browse Source
This commit is contained in:
1073413548 2024-09-03 18:13:15 +08:00
parent d9d9bdd8b3
commit a24d186920
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractInfoVo.java
View File

@ -99,6 +99,10 @@ public class PsContractInfoVo implements Serializable {
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
private Date endServiceDate; private Date endServiceDate;
/**
* 合同结束天数
*/
private Integer endNum;
/** /**
* 办理期限 * 办理期限
*/ */
@ -232,5 +236,6 @@ public class PsContractInfoVo implements Serializable {
/** /**
* 续费日期 * 续费日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date renewalDate; private Date renewalDate;
} }

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
View File

@ -637,6 +637,11 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
if(StringUtils.equals(CommonStatusEnum.FAIL.getCode(),vo.getIsCancel())){ if(StringUtils.equals(CommonStatusEnum.FAIL.getCode(),vo.getIsCancel())){
vo.setContractStatusDesc(approverRecordService.getLastFail(vo.getContractCode(),vo.getContractCode(),List.of(ApproverTypeEnum.CANCELLA.getCode()))); vo.setContractStatusDesc(approverRecordService.getLastFail(vo.getContractCode(),vo.getContractCode(),List.of(ApproverTypeEnum.CANCELLA.getCode())));
} }
//天数
if(vo.getEndServiceDate() != null){
int num = DateUtils.differentDaysByMillisecond(new Date(), vo.getEndServiceDate());
vo.setEndNum(Math.max(num, 0));
}
return vo; return vo;
} }
private void fillMoney(PsContractInfoVo vo){ private void fillMoney(PsContractInfoVo vo){