From 2a2edd2c92bbef5765b1bf96bc7a42986a26efc4 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 23 四月 2025 18:15:30 +0800
Subject: [PATCH] 【UPDATE】1.增加标准工序导入功能 2.修改日历功能字段类型
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java
index dfb3c28..ed19b40 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsResourceGroupServiceImpl.java
@@ -1,5 +1,6 @@
package com.aps.core.service.impl;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Stream;
@@ -8,7 +9,6 @@
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.mapper.ApsResourceGroupTempMapper;
-import com.aps.core.param.ApsResourceGroupParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsResourceGroupMapper;
@@ -49,7 +49,7 @@
* @return 璧勬簮缁�
*/
@Override
- public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroupParam apsResourceGroup)
+ public List<ApsResourceGroup> selectApsResourceGroupList(ApsResourceGroup apsResourceGroup)
{
return apsResourceGroupMapper.selectApsResourceGroupList(apsResourceGroup);
}
@@ -116,7 +116,9 @@
tempList.forEach(temp->{
temp.setId(IdUtils.simpleUUID());
//璁＄畻閫昏緫锛氱悊璁轰骇鑳�=璁惧鏁伴噺x姣忔棩鐞嗚鏃堕棿x鎴闇�姹傛棩鍓╀綑澶╂暟
- temp.setTheoryCapacity(temp.getDevicesQuantity()*temp.getTheoryHours()*temp.getRestDays());
+ BigDecimal devicesQuantity = new BigDecimal(temp.getDevicesQuantity());
+ BigDecimal restDays = new BigDecimal(temp.getRestDays());
+ temp.setTheoryCapacity(devicesQuantity.multiply(temp.getTheoryHours()).multiply(restDays));
temp.setBatchNumber(batchNum);
temp.setCreateTime(DateUtils.getNowDate());
apsResourceGroupTempMapper.insertApsResourceGroupTemp(temp);
--
Gitblit v1.9.3