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

Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2025-10-15 01:24:54 +08:00
parent 77fa7563d6 808208472e
commit fffbf0dcb5
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);
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");
}