From cb966ac5c02835eab5a99b7b93a5a9a063cf3201 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 六月 2025 15:55:08 +0800
Subject: [PATCH] 人员优化
---
main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
index 4d3b647..3d006fd 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/ProductionMasterServiceImpl.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.business.dto.ProductionMasterDto;
import com.ruoyi.business.entity.*;
@@ -18,6 +17,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -77,7 +77,6 @@
IPage<ProductionMasterDto> dtoPage = new Page<>();
BeanUtils.copyProperties(entityPage, dtoPage, "records");
dtoPage.setRecords(dtoList);
-
return dtoPage;
}
@@ -212,15 +211,12 @@
coalIds.add(p.getCoalId());
}
- List<CoalInfo> coalInfos = coalInfoMapper.selectList(new LambdaQueryWrapper<CoalInfo>().in(CoalInfo::getId, coalIds));
-
ProductionMaster master = new ProductionMaster();
master.setProductionQuantity(totalQuantity);
master.setTotalCost(totalCost);
master.setLaborCost(totalLabor);
master.setEnergyConsumptionCost(totalEnergy);
master.setEquipmentDepreciation(totalDepreciation);
- master.setCoal(coalInfos.stream().map(CoalInfo::getCoal).collect(Collectors.joining(",")));
master.setCoalId(coalIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
return master;
@@ -265,7 +261,8 @@
pending.setSupplierName("鐢熶骇鍔犲伐鍏ュ簱");
pending.setTotalPriceIncludingTax(p.getTotalCost());
pending.setPriceIncludingTax(p.getPurchasePrice());
- pending.setPriceIncludingTax(p.getPurchasePrice());
+ pending.setRegistrantId(p.getProducerId());
+ pending.setRegistrationDate(LocalDate.now());
pendingInventoryMapper.insert(pending);
}
}
--
Gitblit v1.9.3