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-14 22:34:11 +08:00
parent 49241d48e3
commit bab5c3ef1d
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ public class ClzSltAgreementInfoController extends BaseController {
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");
} }
@ -617,16 +617,16 @@ public class ClzSltAgreementInfoController extends BaseController {
Date teamExitTime = simulateTeamExitTime(); Date teamExitTime = simulateTeamExitTime();
for (MaterialSltAgreementInfo bean : returnedList) { // for (MaterialSltAgreementInfo bean : returnedList) {
// 只处理已退还的物资 // // 只处理已退还的物资
if (bean.getEndTime() != null) { // if (bean.getEndTime() != null) {
long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime); // long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime);
if (overdueDays >= 16) { // if (overdueDays >= 16) {
// 超期16天以上计为丢失 // // 超期16天以上计为丢失
overdueList.add(bean); // overdueList.add(bean);
} // }
} // }
} // }
return overdueList; return overdueList;
} }

24
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java
View File

@ -757,16 +757,16 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic
Date teamExitTime = simulateTeamExitTime(); Date teamExitTime = simulateTeamExitTime();
for (MaterialSltAgreementInfo bean : returnedList) { // for (MaterialSltAgreementInfo bean : returnedList) {
// 只处理已退还的物资 // // 只处理已退还的物资
if (bean.getEndTime() != null) { // if (bean.getEndTime() != null) {
long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime); // long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime);
if (overdueDays >= 16) { // if (overdueDays >= 16) {
// 超期16天以上计为丢失 // // 超期16天以上计为丢失
overdueList.add(bean); // overdueList.add(bean);
} // }
} // }
} // }
return overdueList; return overdueList;
} }
@ -813,7 +813,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic
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");
} }
@ -826,7 +826,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic
} }
// 计算超期天数 // 计算超期天数
long overdueDays = calculateOverdueDays(materialReturnTime, exitTime); long overdueDays = calculateOverdueDays(materialReturnTime, exitTime);
if(overdueDays < 8 ){ if(overdueDays <= 7 ){
bean.setOverDay(0L); bean.setOverDay(0L);
}else{ }else{
bean.setOverDay(overdueDays-7); bean.setOverDay(overdueDays-7);

2
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml
View File

@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
left join ma_type mt on sai.type_id = mt.type_id left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id
where sai.agreement_id = #{agreementId} and sai.end_time is null and sai.is_slt=1 where sai.agreement_id = #{agreementId} and sai.status =0 and sai.is_slt=1
) res ) res
GROUP BY res.typeId,res.startTime,res.endTime GROUP BY res.typeId,res.startTime,res.endTime
</select> </select>