From 5a0dbf5c84f677c9f20252ccc63221dc7ba68d6c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 15 五月 2025 08:48:07 +0800
Subject: [PATCH] 修改项
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
index b1a67b4..e54d198 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcPlanCloseServiceImpl.java
@@ -151,6 +151,7 @@
if (StringUtils.isNotEmpty(mdcPlanClose.getStartTime()) && StringUtils.isNotEmpty(mdcPlanClose.getEndTime())) {
queryWrapper.between(MdcPlanClose::getTheDate, mdcPlanClose.getStartTime(), mdcPlanClose.getEndTime());
}
+ queryWrapper.eq(MdcPlanClose::getCloseType, mdcPlanClose.getCloseType());
queryWrapper.orderByDesc(MdcPlanClose::getTheDate).orderByDesc(MdcPlanClose::getEquipmentId);
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<MdcPlanClose> mdcPlanCloses = this.baseMapper.selectList(queryWrapper);
@@ -164,28 +165,21 @@
return mv;
}
+ /**
+ * 璁＄畻 璁″垝/闈炶鍒掑仠鏈哄綋澶╂�绘椂闀�
+ * @param equipmentId
+ * @param validDate
+ * @param closeType
+ * @return
+ */
@Override
- public BigDecimal findPlanTimeDuration(BigDecimal actualWorkDayCount, String planCloseType) {
- BigDecimal result = new BigDecimal("0");
-// List<MdcPlanClose> mdcPlanCloses = this.baseMapper.selectList(new LambdaQueryWrapper<MdcPlanClose>().in(MdcPlanClose::getPlanCloseType, Arrays.asList(planCloseType.split(","))));
-// if (mdcPlanCloses != null && !mdcPlanCloses.isEmpty()) {
-// for (MdcPlanClose mdcPlanClose : mdcPlanCloses) {
-// switch (mdcPlanClose.getPlanCloseTimeType()) {
-// case MdcConstant.DAY:
-// result = result.add(actualWorkDayCount.multiply(new BigDecimal(mdcPlanClose.getPlanCloseTimeLong())));
-// break;
-// case MdcConstant.WEEK:
-// result = result.add(new BigDecimal("4").multiply(new BigDecimal(mdcPlanClose.getPlanCloseTimeLong())));
-// break;
-// case MdcConstant.MONTH:
-// result = result.add(new BigDecimal(mdcPlanClose.getPlanCloseTimeLong()));
-// break;
-// default:
-// break;
-// }
-// }
-// }
- return result;
+ public Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType) {
+ Integer planTimeDuration = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
+ if (planTimeDuration == null) {
+ return 0;
+ } else {
+ return planTimeDuration;
+ }
}
}
--
Gitblit v1.9.3