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 3ae632ba..72a34dab 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 @@ -226,7 +226,7 @@ public class ClzSltAgreementInfoController extends BaseController { if(materialReturnTime == null){ materialReturnTime = DateTime.now(); } - String teamExitTime = bean.getActualExitTime(); + String teamExitTime = date; if (teamExitTime == null) { teamExitTime = DateTime.now().toString("yyyy-MM-dd"); } @@ -617,16 +617,16 @@ public class ClzSltAgreementInfoController extends BaseController { Date teamExitTime = simulateTeamExitTime(); - for (MaterialSltAgreementInfo bean : returnedList) { - // 只处理已退还的物资 - if (bean.getEndTime() != null) { - long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime); - if (overdueDays >= 16) { - // 超期16天以上计为丢失 - overdueList.add(bean); - } - } - } +// for (MaterialSltAgreementInfo bean : returnedList) { +// // 只处理已退还的物资 +// if (bean.getEndTime() != null) { +// long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime); +// if (overdueDays >= 16) { +// // 超期16天以上计为丢失 +// overdueList.add(bean); +// } +// } +// } return overdueList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java index 8fb42a74..075de9e8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/ClzSltAgreementInfoServiceImpl.java @@ -757,16 +757,16 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic Date teamExitTime = simulateTeamExitTime(); - for (MaterialSltAgreementInfo bean : returnedList) { - // 只处理已退还的物资 - if (bean.getEndTime() != null) { - long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime); - if (overdueDays >= 16) { - // 超期16天以上计为丢失 - overdueList.add(bean); - } - } - } +// for (MaterialSltAgreementInfo bean : returnedList) { +// // 只处理已退还的物资 +// if (bean.getEndTime() != null) { +// long overdueDays = calculateOverdueDays(bean.getEndTime(), teamExitTime); +// if (overdueDays >= 16) { +// // 超期16天以上计为丢失 +// overdueList.add(bean); +// } +// } +// } return overdueList; } @@ -813,7 +813,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic if(materialReturnTime == null){ materialReturnTime = DateTime.now(); } - String teamExitTime = bean.getActualExitTime(); + String teamExitTime = date; if (teamExitTime == null) { teamExitTime = DateTime.now().toString("yyyy-MM-dd"); } @@ -826,7 +826,7 @@ public class ClzSltAgreementInfoServiceImpl implements ClzSltAgreementInfoServic } // 计算超期天数 long overdueDays = calculateOverdueDays(materialReturnTime, exitTime); - if(overdueDays < 8 ){ + if(overdueDays <= 7 ){ bean.setOverDay(0L); }else{ bean.setOverDay(overdueDays-7); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml index 3421cd92..0826b00e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/ClzAgreementInfoMapper.xml @@ -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 ma_type mt on sai.type_id = mt.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 GROUP BY res.typeId,res.startTime,res.endTime