bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加超期日期

This commit is contained in:
bonus 2025-10-15 01:24:39 +08:00
parent d2c103ca1a
commit 808208472e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java
View File

@ -442,6 +442,8 @@ public class ClzSltAgreementInfoController extends BaseController {
List<MaterialSltAgreementInfo> leaseList = new ArrayList<>(oneOfListLease); List<MaterialSltAgreementInfo> leaseList = new ArrayList<>(oneOfListLease);
for (MaterialSltAgreementInfo bean : leaseList) { for (MaterialSltAgreementInfo bean : leaseList) {
// 数据安全检查 // 数据安全检查
if (null == bean.getLeasePrice()) { if (null == bean.getLeasePrice()) {
@ -455,13 +457,22 @@ public class ClzSltAgreementInfoController extends BaseController {
if (Objects.isNull(bean.getLeaseDays())) { if (Objects.isNull(bean.getLeaseDays())) {
bean.setLeaseDay(0L); bean.setLeaseDay(0L);
} }
String date = null ;
//先判断是否在场
String exitTime1= clzSltAgreementInfoMapper.getTeamSjOutTime(bean);
if( exitTime1!=null && !exitTime1.isEmpty() ){
}else{
date = clzSltAgreementInfoMapper.getTeamOutTime(bean);
}
// 物资已退还，按照天数来计算费用 // 物资已退还，按照天数来计算费用
Date materialReturnTime = bean.getEndTime(); Date materialReturnTime = bean.getEndTime();
if(materialReturnTime == null){ if(materialReturnTime == null){
materialReturnTime = DateTime.now(); materialReturnTime = DateTime.now();
} }
String teamExitTime = bean.getActualExitTime(); String teamExitTime =date;
if (teamExitTime == null) { if (teamExitTime == null) {
teamExitTime = DateTime.now().toString("yyyy-MM-dd"); teamExitTime = DateTime.now().toString("yyyy-MM-dd");
} }