From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
index 07d569a..00454ef 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
@@ -6,12 +6,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.entity.MdcEquipmentOvertime;
-import org.jeecg.modules.mdc.entity.MdcNoplanClose;
import org.jeecg.modules.mdc.mapper.MdcEquipmentOvertimeMapper;
import org.jeecg.modules.mdc.service.IMdcEquipmentOvertimeService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -20,6 +21,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -119,9 +122,55 @@
//鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
//update-begin---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍔犵彮绠＄悊鍒楄〃鏁版嵁", "瀵煎嚭浜�:"+user.getRealname(), "鍔犵彮绠＄悊"));
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("鍔犵彮绠＄悊鍒楄〃鏁版嵁", "瀵煎嚭浜�:" + user.getRealname(), "鍔犵彮绠＄悊"));
//update-end---author:wangshuai ---date:20211227 for锛歔JTC-116]瀵煎嚭浜哄啓姝讳簡------------
mv.addObject(NormalExcelConstants.DATA_LIST, mdcEquipmentOvertimes);
return mv;
}
+
+ /**
+ * 璁＄畻鍔犵彮鏃堕棿锛堝垎閽燂級
+ *
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ @Override
+ public BigDecimal computeOvertime(String equipmentId, String validDate) {
+ List<MdcEquipmentOvertime> list = this.baseMapper.computeOvertime(equipmentId, validDate.replaceAll("-", ""));
+ BigDecimal result = new BigDecimal("0");
+ if (list != null && !list.isEmpty()) {
+ for (MdcEquipmentOvertime equipmentOvertime : list) {
+ result = result.add(equipmentOvertime.getDuration().divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP));
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcEquipmentOvertime
+ * @return
+ */
+ @Override
+ public boolean addOvertime(MdcEquipmentOvertime mdcEquipmentOvertime) {
+ String[] equipmentIds = mdcEquipmentOvertime.getEquipmentId().split(",");
+ List<MdcEquipmentOvertime> mdcEquipmentOvertimes = new ArrayList<>();
+ // 璁＄畻鏃堕暱(绉�)
+ String startTime = mdcEquipmentOvertime.getStartTime();
+ String endTime = mdcEquipmentOvertime.getEndTime();
+ long duration = DateUtils.differentSecond(DateUtils.setTimeForDay(DateUtils.getNow(), startTime), DateUtils.setTimeForDay(DateUtils.getNow(), endTime));
+ for (String equipmentId : equipmentIds) {
+ MdcEquipmentOvertime equipmentOvertime = new MdcEquipmentOvertime();
+ equipmentOvertime.setEquipmentId(equipmentId);
+ equipmentOvertime.setTheDate(mdcEquipmentOvertime.getTheDate());
+ equipmentOvertime.setAutoFlag(CommonConstant.AUTO_FLAG_N);
+ equipmentOvertime.setStartTime(mdcEquipmentOvertime.getStartTime());
+ equipmentOvertime.setEndTime(mdcEquipmentOvertime.getEndTime());
+ equipmentOvertime.setDuration(new BigDecimal(duration));
+ mdcEquipmentOvertimes.add(equipmentOvertime);
+ }
+ return super.saveBatch(mdcEquipmentOvertimes);
+ }
}
--
Gitblit v1.9.3