diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java index 4822639c..48ce6668 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java @@ -442,6 +442,8 @@ public class ClzSltAgreementInfoController extends BaseController { List leaseList = new ArrayList<>(oneOfListLease); + + for (MaterialSltAgreementInfo bean : leaseList) { // 数据安全检查 if (null == bean.getLeasePrice()) { @@ -455,13 +457,22 @@ public class ClzSltAgreementInfoController extends BaseController { if (Objects.isNull(bean.getLeaseDays())) { 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(); if(materialReturnTime == null){ materialReturnTime = DateTime.now(); } - String teamExitTime = bean.getActualExitTime(); + String teamExitTime =date; if (teamExitTime == null) { teamExitTime = DateTime.now().toString("yyyy-MM-dd"); }