From ff09f8e85d51c5d127796bfbd097f5fad9267d4b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 七月 2026 15:04:42 +0800
Subject: [PATCH] 导出工资xlsx
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 659 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 547 insertions(+), 112 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index 9790532..23b059e 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -5,11 +5,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.pojo.Product;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.production.mapper.ProductionAccountMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.bean.dto.ProductionAccountDto;
+import com.ruoyi.production.bean.dto.ProductionProductMainDto;
import com.ruoyi.production.pojo.ProductionAccount;
import com.ruoyi.technology.mapper.TechnologyOperationMapper;
import com.ruoyi.technology.pojo.TechnologyOperation;
@@ -18,9 +23,11 @@
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.dto.StaffSalaryCalculateDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
+import com.ruoyi.staff.mapper.StaffContractMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
import com.ruoyi.staff.pojo.StaffLeave;
+import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.pojo.StaffSalaryDetail;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryDetailService;
@@ -44,8 +51,10 @@
import java.time.YearMonth;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import java.io.IOException;
+import java.text.SimpleDateFormat;
/**
* <p>
@@ -65,8 +74,11 @@
private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
private final SysUserDeptMapper sysUserDeptMapper;
private final StaffLeaveMapper staffLeaveMapper;
+ private final StaffContractMapper staffContractMapper;
private final SysDeptMapper sysDeptMapper;
+ private final ProductMapper productMapper;
private final ProductionAccountMapper productionAccountMapper;
+ private final ProductionProductMainMapper productionProductMainMapper;
private final TechnologyOperationMapper technologyOperationMapper;
@Override
@@ -87,6 +99,18 @@
Page<StaffSalaryMain> page1 = staffSalaryMainMapper.selectPage(page, staffSalaryMainLambdaQueryWrapper);
page1.getRecords().forEach(main -> {
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
+ staffSalaryDetailList.forEach(detail -> {
+ if (detail.getEntryDate() == null && detail.getStaffOnJobId() != null) {
+ StaffContract staffContract = staffContractMapper.selectOne(new LambdaQueryWrapper<StaffContract>()
+ .eq(StaffContract::getStaffOnJobId, detail.getStaffOnJobId())
+ .orderByAsc(StaffContract::getContractStartTime)
+ .orderByAsc(StaffContract::getId)
+ .last("limit 1"));
+ if (staffContract != null && staffContract.getContractStartTime() != null) {
+ detail.setEntryDate(formatEntryDate(staffContract.getContractStartTime()));
+ }
+ }
+ });
main.setStaffSalaryDetailList(staffSalaryDetailList);
});
return AjaxResult.success(page1);
@@ -182,33 +206,44 @@
@Override
public AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto) {
- if(CollectionUtils.isEmpty(calculateSalaryDto.getIds())){
+ if (CollectionUtils.isEmpty(calculateSalaryDto.getIds())) {
return AjaxResult.error("鍙傛暟閿欒");
}
java.math.BigDecimal deductAmount = calculateSalaryDto.getDeductAmount() == null
? java.math.BigDecimal.ZERO
: calculateSalaryDto.getDeductAmount();
List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(calculateSalaryDto.getIds()); // 閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅
- if(CollectionUtils.isEmpty(longs)){
+ if (CollectionUtils.isEmpty(longs)) {
return AjaxResult.error("鏃犲憳宸�");
}
List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> id : longs) {
Long staffOnJobId = id.get("id") == null ? null : ((Number) id.get("id")).longValue();
// 鍒ゆ柇鍛樺伐鏄惁涓哄綋鏈堢鑱�
- if((Integer) id.get("staffState") == 0){
+ if ((Integer) id.get("staffState") == 0) {
StaffLeave id1 = staffLeaveMapper.selectOne(new LambdaQueryWrapper<StaffLeave>()
.eq(StaffLeave::getStaffOnJobId, staffOnJobId)
.like(StaffLeave::getLeaveDate, calculateSalaryDto.getDate()));
- if(id1 == null){
+ if (id1 == null) {
continue;
}
}
id.put("otherDeduct", deductAmount);
+ if (!id.containsKey("allowance")) {
+ id.put("allowance", java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ }
+ if (id.get("entryDate") == null) {
+ StaffContract staffContract = staffContractMapper.selectOne(new LambdaQueryWrapper<StaffContract>()
+ .eq(StaffContract::getStaffOnJobId, staffOnJobId)
+ .orderByDesc(StaffContract::getId)
+ .last("limit 1"));
+ if (staffContract != null && staffContract.getContractStartTime() != null) {
+ id.put("entryDate", formatEntryDate(staffContract.getContractStartTime()));
+ }
+ }
Long sysUserId = schemeApplicableStaffService.getUidByStaffId(staffOnJobId);
BigDecimal monthTimeTotal = resolveMonthTimeTotal(sysUserId, calculateSalaryDto.getDate());
id.put("monthTimeTotal", monthTimeTotal);
- id.put("convertedWorkHours", monthTimeTotal);
schemeApplicableStaffService.calculateByEmployeeId(staffOnJobId == null ? null : staffOnJobId.intValue(), id, calculateSalaryDto.getDate());
mapList.add(id);
}
@@ -235,15 +270,12 @@
map.put("attendanceBonus", staffSalaryCalculateDto.getAttendanceBonus());
map.put("pieceSalary", staffSalaryCalculateDto.getPieceSalary());
map.put("hourlySalary", staffSalaryCalculateDto.getHourlySalary());
- map.put("monthWorkDays", staffSalaryCalculateDto.getMonthWorkDays());
- map.put("standardHours", staffSalaryCalculateDto.getStandardHours());
map.put("monthTimeTotal", staffSalaryCalculateDto.getMonthTimeTotal());
map.put("conversionRatio", staffSalaryCalculateDto.getConversionRatio());
- map.put("convertedWorkHours", staffSalaryCalculateDto.getConvertedWorkHours());
map.put("actualOutput", staffSalaryCalculateDto.getActualOutput());
map.put("standardQuantity", staffSalaryCalculateDto.getStandardQuantity());
- map.put("conversionFactor", staffSalaryCalculateDto.getConversionFactor());
map.put("otherIncome", staffSalaryCalculateDto.getOtherIncome());
+ map.put("allowance", staffSalaryCalculateDto.getAllowance());
map.put("socialPersonal", staffSalaryCalculateDto.getSocialPersonal());
map.put("fundPersonal", staffSalaryCalculateDto.getFundPersonal());
map.put("otherDeduct", staffSalaryCalculateDto.getOtherDeduct());
@@ -280,17 +312,35 @@
exportData.setSalaryMonth(main.getSalaryMonth());
exportData.setSalaryTitle(main.getSalaryTitle());
exportData.setStaffName(detail.getStaffName());
+ if (detail.getEntryDate() != null) {
+ exportData.setEntryDate(detail.getEntryDate());
+ } else if (detail.getStaffOnJobId() != null) {
+ StaffContract staffContract = staffContractMapper.selectOne(new LambdaQueryWrapper<StaffContract>()
+ .eq(StaffContract::getStaffOnJobId, detail.getStaffOnJobId())
+ .orderByAsc(StaffContract::getContractStartTime)
+ .orderByAsc(StaffContract::getId)
+ .last("limit 1"));
+ if (staffContract != null && staffContract.getContractStartTime() != null) {
+ exportData.setEntryDate(formatEntryDate(staffContract.getContractStartTime()));
+ }
+ }
exportData.setDeptName(detail.getDeptName());
exportData.setBasicSalary(detail.getBasicSalary());
exportData.setAttendanceBonus(detail.getAttendanceBonus());
- exportData.setPieceSalary(detail.getPieceSalary());
- exportData.setHourlySalary(detail.getHourlySalary());
- exportData.setMonthWorkDays(detail.getMonthWorkDays());
- exportData.setStandardHours(detail.getStandardHours());
+ exportData.setDailySalary(detail.getBasicSalary() != null && detail.getWorkDays() != null && detail.getWorkDays() > 0
+ ? detail.getBasicSalary().divide(new BigDecimal(detail.getWorkDays()), 3, java.math.RoundingMode.HALF_UP)
+ : null);
+ exportData.setWorkDays(detail.getWorkDays());
+ exportData.setConversionRatio(detail.getConversionRatio() == null
+ ? null
+ : detail.getConversionRatio().setScale(4, java.math.RoundingMode.HALF_UP));
exportData.setMonthTimeTotal(detail.getMonthTimeTotal());
- exportData.setConversionRatio(detail.getConversionRatio());
- exportData.setConvertedWorkHours(detail.getConvertedWorkHours());
exportData.setOtherIncome(detail.getOtherIncome());
+ exportData.setPersonalLeave(detail.getPersonalLeave());
+ exportData.setSickLeave(detail.getSickLeave());
+ exportData.setBereavementLeave(detail.getBereavementLeave());
+ exportData.setMarriageLeave(detail.getMarriageLeave());
+ exportData.setAllowance(detail.getAllowance());
exportData.setSocialPersonal(detail.getSocialPersonal());
exportData.setFundPersonal(detail.getFundPersonal());
exportData.setOtherDeduct(detail.getOtherDeduct());
@@ -310,7 +360,10 @@
/**
* 姹囨�诲憳宸ュ綋鏈堟湀鏃堕棿鍚堣銆�
- * 璁℃椂宸ュ簭鐩存帴鍙栧伐鏃讹紝璁′欢宸ュ簭鎸変骇閲忔姌绠楀悗鍐嶅彔鍔犺ˉ淇悊宸ユ椂銆�
+ * 瑙勫垯锛�
+ * 1. 灏忔彁鐞� / 澶ф彁鐞� / 璐濇柉锛氭湀浜ф姌鍚堝皬鎻愮惔鏁伴噺 / 宸ュ簭鏍囧噯鏁伴噺 脳 8 + 淇ˉ鐞嗗伐鏃�
+ * 2. 鍏朵粬浜у搧锛氬綋鏈堝疄闄呬骇閲� / 瀵瑰簲浜у搧鏍囧噯鏁伴噺 脳 8 + 淇ˉ鐞嗗伐鏃�
+ * 鏈�缁堢粨鏋滃氨鏄伐璧勮〃閲岀殑鏈堟椂闂村悎璁°��
*/
private java.math.BigDecimal resolveMonthTimeTotal(Long sysUserId, String date) {
if (sysUserId == null || sysUserId <= 0 || StringUtils.isEmpty(date)) {
@@ -324,25 +377,108 @@
java.math.BigDecimal workHour = toDecimal(item.get("workHour"));
java.math.BigDecimal repairWorkHour = toDecimal(item.get("repairWorkHour"));
java.math.BigDecimal standardQuantity = toDecimal(item.get("standardQuantity"));
- java.math.BigDecimal conversionFactor = toDecimal(item.get("conversionFactor"));
- java.math.BigDecimal rowTotal;
- if (Integer.valueOf(0).equals(operationType)) {
- rowTotal = workHour.add(repairWorkHour);
- } else {
- if (standardQuantity.compareTo(java.math.BigDecimal.ZERO) <= 0) {
- rowTotal = java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
- } else {
- rowTotal = finishedNum
- .divide(standardQuantity, 8, java.math.RoundingMode.HALF_UP)
- .multiply(new java.math.BigDecimal("8"))
- .multiply(conversionFactor)
- .add(repairWorkHour)
- .setScale(2, java.math.RoundingMode.HALF_UP);
- }
- }
+ java.math.BigDecimal productStandardQuantity = toDecimal(item.get("productStandardQuantity"));
+ java.math.BigDecimal violinFactor = toDecimal(item.get("violinFactor"));
+ java.math.BigDecimal violaFactor = toDecimal(item.get("violaFactor"));
+ java.math.BigDecimal bassFactor = toDecimal(item.get("bassFactor"));
+ String productName = item.get("productName") == null ? null : String.valueOf(item.get("productName"));
+ java.math.BigDecimal rowTotal = calculateOperationTime(
+ operationType,
+ productName,
+ finishedNum,
+ workHour,
+ repairWorkHour,
+ standardQuantity,
+ productStandardQuantity,
+ violinFactor,
+ violaFactor,
+ bassFactor
+ );
total = total.add(rowTotal).setScale(2, java.math.RoundingMode.HALF_UP);
}
return total;
+ }
+
+ /**
+ * 璁＄畻鍗曟潯宸ュ簭鐨勬姌绠楀伐鏃躲��
+ * 杩欓噷鏄湀鏃堕棿鍚堣鐨勬牳蹇冨垎鏀細
+ * - 灏忔彁鐞� / 澶ф彁鐞� / 璐濇柉锛氭湀浜ф姌鍚堝皬鎻愮惔鏁伴噺 / 宸ュ簭鏍囧噯鏁伴噺 脳 8 + 淇ˉ鐞嗗伐鏃讹紱
+ * - 鍏朵粬浜у搧锛氬綋鏈堝疄闄呬骇閲� / 瀵瑰簲浜у搧鏍囧噯鏁伴噺 脳 8 + 淇ˉ鐞嗗伐鏃躲��
+ */
+ private java.math.BigDecimal calculateOperationTime(Integer operationType,
+ String productName,
+ java.math.BigDecimal finishedNum,
+ java.math.BigDecimal workHour,
+ java.math.BigDecimal repairWorkHour,
+ java.math.BigDecimal standardQuantity,
+ java.math.BigDecimal productStandardQuantity,
+ java.math.BigDecimal violinFactor,
+ java.math.BigDecimal violaFactor,
+ java.math.BigDecimal bassFactor) {
+ if (isInstrumentProduct(productName)) {
+ java.math.BigDecimal foldedQuantity = calculateFoldedQuantity(
+ finishedNum,
+ resolveInstrumentFactor(productName, violinFactor, violaFactor, bassFactor)
+ );
+ if (standardQuantity.compareTo(java.math.BigDecimal.ZERO) <= 0) {
+ return java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+ return foldedQuantity
+ .divide(standardQuantity, 8, java.math.RoundingMode.HALF_UP)
+ .multiply(new java.math.BigDecimal("8"))
+ .add(repairWorkHour)
+ .setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+ if (productStandardQuantity.compareTo(java.math.BigDecimal.ZERO) <= 0) {
+ return java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+ return finishedNum
+ .divide(productStandardQuantity, 8, java.math.RoundingMode.HALF_UP)
+ .multiply(new java.math.BigDecimal("8"))
+ .add(repairWorkHour)
+ .setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+
+ /**
+ * 鎸変骇鍝佸悕绉板拰閰嶇疆绯绘暟鎶樼畻浜ч噺銆�
+ * 鍙灏忔彁鐞淬�佸ぇ鎻愮惔銆佽礉鏂笁绫讳骇鍝佺敓鏁堬紝
+ * 杩斿洖鐨勬槸鍙敤浜庡悗缁伐搴忔爣鍑嗘暟閲忔崲绠楃殑缁熶竴鎶樺悎浜ч噺銆�
+ */
+ private java.math.BigDecimal calculateFoldedQuantity(java.math.BigDecimal quantity,
+ java.math.BigDecimal factor) {
+ if (quantity == null || factor == null) {
+ return java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+ return quantity.multiply(factor).setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+
+ private boolean isInstrumentProduct(String productName) {
+ return "灏忔彁鐞�".equals(productName)
+ || "澶ф彁鐞�".equals(productName)
+ || "璐濇柉".equals(productName);
+ }
+
+ private java.math.BigDecimal resolveInstrumentFactor(String productName,
+ java.math.BigDecimal violinFactor,
+ java.math.BigDecimal violaFactor,
+ java.math.BigDecimal bassFactor) {
+ if ("灏忔彁鐞�".equals(productName)) {
+ return violinFactor;
+ }
+ if ("澶ф彁鐞�".equals(productName)) {
+ return violaFactor;
+ }
+ if ("璐濇柉".equals(productName)) {
+ return bassFactor;
+ }
+ return java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+
+ private String formatEntryDate(java.util.Date entryDate) {
+ if (entryDate == null) {
+ return null;
+ }
+ return new SimpleDateFormat("yyyy-MM-dd").format(entryDate);
}
private java.math.BigDecimal toDecimal(Object value) {
@@ -364,86 +500,32 @@
@Override
public void exportWorkHours(HttpServletResponse response, String salaryMonth) {
- List<ProductionAccount> accountList = queryProductionAccounts(salaryMonth);
- List<String> operationNames = accountList.stream()
- .map(ProductionAccount::getTechnologyOperationName)
- .filter(StringUtils::isNotEmpty)
- .distinct()
- .sorted()
- .collect(Collectors.toList());
Workbook workbook = new XSSFWorkbook();
CellStyle titleStyle = createStyle(workbook, true, HorizontalAlignment.CENTER, 14, false);
- CellStyle headerStyle = createStyle(workbook, false, HorizontalAlignment.CENTER, 11, false);
+ CellStyle headerStyle = createStyle(workbook, false, HorizontalAlignment.CENTER, 11, true);
CellStyle labelStyle = createStyle(workbook, false, HorizontalAlignment.CENTER, 10, false);
CellStyle numStyle = createStyle(workbook, false, HorizontalAlignment.CENTER, 10, false);
DataFormat dataFormat = workbook.createDataFormat();
numStyle.setDataFormat(dataFormat.getFormat("0.00"));
- if (CollectionUtils.isEmpty(operationNames)) {
- operationNames = new ArrayList<>();
+ List<String> monthList = new ArrayList<>();
+ if (StringUtils.isNotEmpty(salaryMonth)) {
+ monthList.add(salaryMonth);
+ } else {
+ monthList = productionAccountMapper.selectAccountingMonths();
}
-
- int sheetIndex = 1;
- for (String operationName : operationNames) {
- TechnologyOperation operation = technologyOperationMapper.selectOne(
- new LambdaQueryWrapper<TechnologyOperation>().eq(TechnologyOperation::getName, operationName).last("limit 1"));
- String sheetName = operationName;
- if (sheetName.length() > 31) {
- sheetName = sheetName.substring(0, 31);
- }
- Sheet sheet = workbook.createSheet(sheetName);
- int rowIdx = 0;
- Row titleRow = sheet.createRow(rowIdx++);
- titleRow.setHeightInPoints(52.5f);
- titleRow.createCell(0).setCellValue(operationName + "宸ユ椂缁熻");
- titleRow.getCell(0).setCellStyle(titleStyle);
- sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 3));
-
- Row workDayRow = sheet.createRow(rowIdx++);
- workDayRow.createCell(0).setCellValue("宸ヤ綔鏃�");
- workDayRow.getCell(0).setCellStyle(headerStyle);
- Integer monthWorkDays = calculateWorkDays(salaryMonth);
- createNumberCell(workDayRow, 2, monthWorkDays == null ? null : new java.math.BigDecimal(monthWorkDays), headerStyle);
- workDayRow.createCell(3).setCellValue("澶�");
- workDayRow.getCell(3).setCellStyle(headerStyle);
- createNumberCell(workDayRow, 4, monthWorkDays == null ? null : new java.math.BigDecimal(monthWorkDays * 8), headerStyle);
- workDayRow.createCell(5).setCellValue("灏忔椂");
- workDayRow.getCell(5).setCellStyle(headerStyle);
-
- Row headRow = sheet.createRow(rowIdx++);
- headRow.createCell(0).setCellValue("浜哄憳");
- headRow.getCell(0).setCellStyle(headerStyle);
- headRow.createCell(1).setCellValue("鏈堜骇閲�");
- headRow.getCell(1).setCellStyle(headerStyle);
- headRow.createCell(2).setCellValue("鎶樼畻鏃堕暱");
- headRow.getCell(2).setCellStyle(headerStyle);
- headRow.createCell(3).setCellValue("宸ヨ祫");
- headRow.getCell(3).setCellStyle(headerStyle);
-
- Map<String, java.math.BigDecimal> standardMap = buildStandardQuantityMap(List.of(operationName));
- Map<String, java.math.BigDecimal> opQtyMap = buildOperationQuantityMap(accountList, operationName);
- Set<String> employeeNames = accountList.stream()
- .map(ProductionAccount::getSchedulingUserName)
- .filter(StringUtils::isNotEmpty)
- .collect(Collectors.toCollection(LinkedHashSet::new));
- for (String staffName : employeeNames) {
- Row row = sheet.createRow(rowIdx++);
- row.createCell(0).setCellValue(staffName);
- row.getCell(0).setCellStyle(labelStyle);
- java.math.BigDecimal qty = opQtyMap.getOrDefault(staffName, java.math.BigDecimal.ZERO);
- createNumberCell(row, 1, qty, numStyle);
- java.math.BigDecimal standardQty = standardMap.getOrDefault(operationName, java.math.BigDecimal.ONE);
- createNumberCell(row, 2, standardQty.compareTo(java.math.BigDecimal.ZERO) == 0 ? java.math.BigDecimal.ZERO : qty.divide(standardQty, 2, java.math.RoundingMode.HALF_UP).multiply(new java.math.BigDecimal("8")), numStyle);
- java.math.BigDecimal wage = operation == null || operation.getSalaryQuota() == null
- ? java.math.BigDecimal.ZERO
- : (Integer.valueOf(1).equals(operation.getType()) ? operation.getSalaryQuota().multiply(qty) : operation.getSalaryQuota());
- createNumberCell(row, 3, wage, numStyle);
- }
-
- for (int i = 0; i <= 3; i++) {
- sheet.autoSizeColumn(i);
- }
- sheetIndex++;
+ if (CollectionUtils.isEmpty(monthList)) {
+ throw new IllegalArgumentException("娌℃湁鍙鍑虹殑鐢熶骇鏍哥畻鏈堜唤");
+ }
+ Sheet nonInstrumentSheet = workbook.createSheet("鐞寸洅閮�");
+ Sheet instrumentSheet = workbook.createSheet("鎴愬搧閮�");
+ int nonInstrumentRowIdx = 0;
+ int instrumentRowIdx = 0;
+ for (String month : monthList) {
+ List<ProductionProductMainDto> accountList = queryProductionDetails(month);
+ Integer monthWorkDays = calculateWorkDays(month);
+ nonInstrumentRowIdx = appendWorkHoursSection(nonInstrumentSheet, nonInstrumentRowIdx, month, false, accountList, monthWorkDays, titleStyle, headerStyle, labelStyle, numStyle, nonInstrumentRowIdx > 0);
+ instrumentRowIdx = appendWorkHoursSection(instrumentSheet, instrumentRowIdx, month, true, accountList, monthWorkDays, titleStyle, headerStyle, labelStyle, numStyle, instrumentRowIdx > 0);
}
try {
@@ -459,11 +541,300 @@
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return new ArrayList<>();
}
// 閫氳繃閮ㄩ棬鑾峰彇浜哄憳id
return sysUserDeptMapper.setSchemeApplicableStaffUserInfo(ids);
+ }
+
+ private int appendWorkHoursSection(Sheet sheet,
+ int startRowIdx,
+ String salaryMonth,
+ boolean instrumentSheet,
+ List<ProductionProductMainDto> accountList,
+ Integer monthWorkDays,
+ CellStyle titleStyle,
+ CellStyle headerStyle,
+ CellStyle labelStyle,
+ CellStyle numStyle,
+ boolean addSectionTitle) {
+ int rowIdx = startRowIdx;
+ List<Map<String, Object>> columns = buildWorkHourColumns(instrumentSheet);
+ int lastCol = 1 + columns.size() + 2;
+ Row titleRow = sheet.createRow(rowIdx++);
+ titleRow.setHeightInPoints(56f);
+ String sectionTitle = (StringUtils.isEmpty(salaryMonth) ? "鏈煡鏈堜唤" : salaryMonth) + "宸ユ椂缁熻";
+ titleRow.createCell(0).setCellValue(sectionTitle);
+ titleRow.getCell(0).setCellStyle(titleStyle);
+ sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), 0, lastCol));
+
+ Row workDayRow = sheet.createRow(rowIdx++);
+ createTextCell(workDayRow, 0, "宸ヤ綔鏃�", numStyle);
+ createDisplayNumberCell(workDayRow, 1, monthWorkDays == null ? null : new java.math.BigDecimal(monthWorkDays), numStyle);
+ createTextCell(workDayRow, 2, "澶�", numStyle);
+ createDisplayNumberCell(workDayRow, 3, monthWorkDays == null ? null : new java.math.BigDecimal(monthWorkDays * 8), numStyle);
+ createTextCell(workDayRow, 4, "灏忔椂", numStyle);
+
+ Row headRow = sheet.createRow(rowIdx++);
+ Row standardRow = sheet.createRow(rowIdx++);
+ createTextCell(headRow, 0, "浜哄憳", numStyle);
+ createTextCell(headRow, 1, "鏍囧噯鏁伴噺", numStyle);
+ CellRangeAddress personRegion = new CellRangeAddress(headRow.getRowNum(), standardRow.getRowNum(), 0, 0);
+ CellRangeAddress standardRegion = new CellRangeAddress(headRow.getRowNum(), standardRow.getRowNum(), 1, 1);
+ sheet.addMergedRegion(personRegion);
+ sheet.addMergedRegion(standardRegion);
+ RegionUtil.setBorderTop(BorderStyle.THIN, personRegion, sheet);
+ RegionUtil.setBorderBottom(BorderStyle.THIN, personRegion, sheet);
+ RegionUtil.setBorderLeft(BorderStyle.THIN, personRegion, sheet);
+ RegionUtil.setBorderRight(BorderStyle.THIN, personRegion, sheet);
+ RegionUtil.setBorderTop(BorderStyle.THIN, standardRegion, sheet);
+ RegionUtil.setBorderBottom(BorderStyle.THIN, standardRegion, sheet);
+ RegionUtil.setBorderLeft(BorderStyle.THIN, standardRegion, sheet);
+ RegionUtil.setBorderRight(BorderStyle.THIN, standardRegion, sheet);
+ int col = 2;
+ for (Map<String, Object> column : columns) {
+ createTextCell(headRow, col, String.valueOf(column.get("label")), numStyle);
+ createDisplayNumberCell(standardRow, col, (java.math.BigDecimal) column.get("standardQty"), numStyle);
+ col++;
+ }
+ createTextCell(headRow, col, "鏈堟椂闂村悎璁�", numStyle);
+ createTextCell(standardRow, col, "", numStyle);
+ col++;
+ createTextCell(headRow, col, "鎶樺悎鍊嶆暟", numStyle);
+ createTextCell(standardRow, col, "", numStyle);
+
+ Map<String, List<ProductionProductMainDto>> grouped = accountList.stream()
+ .filter(item -> item != null && item.getSchedulingUserName() != null)
+ .filter(item -> instrumentSheet == isInstrumentProduct(item.getProductName()))
+ .sorted(java.util.Comparator
+ .comparing(ProductionProductMainDto::getSchedulingUserName, java.util.Comparator.nullsLast(String::compareTo))
+ .thenComparing(item -> StringUtils.isEmpty(item.getProductName()) ? "" : item.getProductName())
+ .thenComparing(item -> StringUtils.isEmpty(item.getProcess()) ? "" : item.getProcess()))
+ .collect(Collectors.groupingBy(
+ ProductionProductMainDto::getSchedulingUserName,
+ LinkedHashMap::new,
+ Collectors.toList()
+ ));
+
+ for (Map.Entry<String, List<ProductionProductMainDto>> entry : grouped.entrySet()) {
+ String staffName = entry.getKey();
+ List<ProductionProductMainDto> staffItems = entry.getValue();
+ java.math.BigDecimal staffMonthTimeTotal = java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP);
+ Map<String, java.math.BigDecimal> quantityMap = new LinkedHashMap<>();
+ Map<String, java.math.BigDecimal> convertedMap = new LinkedHashMap<>();
+ Map<String, java.math.BigDecimal> foldedMap = new LinkedHashMap<>();
+ Map<String, java.math.BigDecimal> violinQuantityMap = new LinkedHashMap<>();
+ Map<String, java.math.BigDecimal> violaQuantityMap = new LinkedHashMap<>();
+ Map<String, java.math.BigDecimal> bassQuantityMap = new LinkedHashMap<>();
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ quantityMap.put(key, java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ convertedMap.put(key, java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ foldedMap.put(key, java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ violinQuantityMap.put(key, java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ violaQuantityMap.put(key, java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ bassQuantityMap.put(key, java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP));
+ }
+ for (ProductionProductMainDto item : staffItems) {
+ String key = instrumentSheet ? item.getProcess() : item.getProductName();
+ if (!quantityMap.containsKey(key)) {
+ continue;
+ }
+ java.math.BigDecimal quantity = item.getQuantity() == null ? java.math.BigDecimal.ZERO : item.getQuantity();
+ TechnologyOperation operation = technologyOperationMapper.selectOne(
+ new LambdaQueryWrapper<TechnologyOperation>()
+ .eq(TechnologyOperation::getName, item.getProcess())
+ .last("limit 1"));
+ java.math.BigDecimal standardQty = instrumentSheet
+ ? (operation == null || operation.getStandardQuantity() == null ? java.math.BigDecimal.ZERO : operation.getStandardQuantity())
+ : (item.getStandardQuantity() == null ? java.math.BigDecimal.ZERO : item.getStandardQuantity());
+ java.math.BigDecimal foldedQty = instrumentSheet ? calculateFoldedQuantity(item, operation) : quantity;
+ java.math.BigDecimal convertedHours = calculateExportConvertedHours(foldedQty, standardQty, item.getRepairWorkHour());
+ quantityMap.merge(key, quantity, java.math.BigDecimal::add);
+ foldedMap.merge(key, foldedQty, java.math.BigDecimal::add);
+ convertedMap.merge(key, convertedHours, java.math.BigDecimal::add);
+ if (instrumentSheet) {
+ if ("灏忔彁鐞�".equals(item.getProductName())) {
+ violinQuantityMap.merge(key, quantity, java.math.BigDecimal::add);
+ } else if ("澶ф彁鐞�".equals(item.getProductName())) {
+ violaQuantityMap.merge(key, quantity, java.math.BigDecimal::add);
+ } else if ("璐濇柉".equals(item.getProductName())) {
+ bassQuantityMap.merge(key, quantity, java.math.BigDecimal::add);
+ }
+ }
+ staffMonthTimeTotal = staffMonthTimeTotal.add(convertedHours).setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+
+ if (!staffItems.isEmpty()) {
+ Row qtyRow = sheet.createRow(rowIdx++);
+ qtyRow.setHeightInPoints(24f);
+ createEdgeCell(sheet.getWorkbook(), qtyRow, 0, staffName, numStyle, true, false, true, true);
+ createTextCell(qtyRow, 1, instrumentSheet ? "鏈堜骇灏�" : "鏈堜骇閲�", numStyle);
+ int dataCol = 2;
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ createDisplayNumberCell(qtyRow, dataCol++, instrumentSheet ? violinQuantityMap.getOrDefault(key, java.math.BigDecimal.ZERO) : quantityMap.getOrDefault(key, java.math.BigDecimal.ZERO), numStyle);
+ }
+ createDisplayNumberCell(qtyRow, dataCol++, null, numStyle);
+ createDisplayNumberCell(qtyRow, dataCol, null, numStyle);
+
+ if (instrumentSheet) {
+ Row violaRow = sheet.createRow(rowIdx++);
+ violaRow.setHeightInPoints(24f);
+ createEdgeCell(sheet.getWorkbook(), violaRow, 0, "", numStyle, false, false, true, true);
+ createTextCell(violaRow, 1, "鏈堜骇澶�", numStyle);
+ dataCol = 2;
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ createDisplayNumberCell(violaRow, dataCol++, violaQuantityMap.getOrDefault(key, java.math.BigDecimal.ZERO), numStyle);
+ }
+ createDisplayNumberCell(violaRow, dataCol++, null, numStyle);
+ createDisplayNumberCell(violaRow, dataCol, null, numStyle);
+
+ Row bassRow = sheet.createRow(rowIdx++);
+ bassRow.setHeightInPoints(24f);
+ createEdgeCell(sheet.getWorkbook(), bassRow, 0, "", numStyle, false, false, true, true);
+ createTextCell(bassRow, 1, "鏈堜骇璐�", numStyle);
+ dataCol = 2;
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ createDisplayNumberCell(bassRow, dataCol++, bassQuantityMap.getOrDefault(key, java.math.BigDecimal.ZERO), numStyle);
+ }
+ createDisplayNumberCell(bassRow, dataCol++, null, numStyle);
+ createDisplayNumberCell(bassRow, dataCol, null, numStyle);
+
+ Row foldedQtyRow = sheet.createRow(rowIdx++);
+ foldedQtyRow.setHeightInPoints(24f);
+ createEdgeCell(sheet.getWorkbook(), foldedQtyRow, 0, "", numStyle, false, false, true, true);
+ createTextCell(foldedQtyRow, 1, "鏈堜骇鎶樺悎灏忔彁", numStyle);
+ dataCol = 2;
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ createDisplayNumberCell(foldedQtyRow, dataCol++, foldedMap.getOrDefault(key, java.math.BigDecimal.ZERO), numStyle);
+ }
+ createDisplayNumberCell(foldedQtyRow, dataCol++, null, numStyle);
+ createDisplayNumberCell(foldedQtyRow, dataCol, null, numStyle);
+
+ Row hoursRow = sheet.createRow(rowIdx++);
+ hoursRow.setHeightInPoints(24f);
+ createEdgeCell(sheet.getWorkbook(), hoursRow, 0, "", headerStyle, false, true, true, true);
+ createTextCell(hoursRow, 1, "鎶樼畻鏃堕暱", headerStyle);
+ dataCol = 2;
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ createDisplayNumberCell(hoursRow, dataCol++, convertedMap.getOrDefault(key, java.math.BigDecimal.ZERO), headerStyle);
+ }
+ createDisplayNumberCell(hoursRow, dataCol++, staffMonthTimeTotal, headerStyle);
+ createDisplayNumberCell(hoursRow, dataCol, monthWorkDays == null || monthWorkDays <= 0
+ ? null
+ : staffMonthTimeTotal.divide(new java.math.BigDecimal(monthWorkDays * 8), 8, java.math.RoundingMode.HALF_UP).setScale(4, java.math.RoundingMode.HALF_UP), headerStyle);
+ CellRangeAddress staffRegion = new CellRangeAddress(qtyRow.getRowNum(), hoursRow.getRowNum(), 0, 0);
+ sheet.addMergedRegion(staffRegion);
+ RegionUtil.setBorderTop(BorderStyle.THIN, staffRegion, sheet);
+ RegionUtil.setBorderBottom(BorderStyle.THIN, staffRegion, sheet);
+ RegionUtil.setBorderLeft(BorderStyle.THIN, staffRegion, sheet);
+ RegionUtil.setBorderRight(BorderStyle.THIN, staffRegion, sheet);
+ } else {
+ Row hoursRow = sheet.createRow(rowIdx++);
+ hoursRow.setHeightInPoints(24f);
+ createEdgeCell(sheet.getWorkbook(), hoursRow, 0, "", headerStyle, false, true, true, true);
+ createTextCell(hoursRow, 1, "鎶樼畻鏃堕暱", headerStyle);
+ dataCol = 2;
+ for (Map<String, Object> column : columns) {
+ String key = String.valueOf(column.get("key"));
+ createDisplayNumberCell(hoursRow, dataCol++, convertedMap.getOrDefault(key, java.math.BigDecimal.ZERO), headerStyle);
+ }
+ createDisplayNumberCell(hoursRow, dataCol++, staffMonthTimeTotal, headerStyle);
+ createDisplayNumberCell(hoursRow, dataCol, monthWorkDays == null || monthWorkDays <= 0
+ ? null
+ : staffMonthTimeTotal.divide(new java.math.BigDecimal(monthWorkDays * 8), 8, java.math.RoundingMode.HALF_UP).setScale(4, java.math.RoundingMode.HALF_UP), headerStyle);
+ CellRangeAddress staffRegion = new CellRangeAddress(qtyRow.getRowNum(), hoursRow.getRowNum(), 0, 0);
+ sheet.addMergedRegion(staffRegion);
+ RegionUtil.setBorderTop(BorderStyle.THIN, staffRegion, sheet);
+ RegionUtil.setBorderBottom(BorderStyle.THIN, staffRegion, sheet);
+ RegionUtil.setBorderLeft(BorderStyle.THIN, staffRegion, sheet);
+ RegionUtil.setBorderRight(BorderStyle.THIN, staffRegion, sheet);
+ }
+ }
+ }
+
+ int[] widths = buildWorkHourColumnWidths(columns.size(), instrumentSheet);
+ for (int i = 0; i < widths.length; i++) {
+ sheet.setColumnWidth(i, widths[i] * 256);
+ }
+ return rowIdx;
+ }
+
+ private List<Map<String, Object>> buildWorkHourColumns(boolean instrumentSheet) {
+ Map<String, Map<String, Object>> columnMap = new LinkedHashMap<>();
+ if (instrumentSheet) {
+ List<TechnologyOperation> operations = technologyOperationMapper.selectList(
+ new LambdaQueryWrapper<TechnologyOperation>()
+ .orderByAsc(TechnologyOperation::getId));
+ for (TechnologyOperation operation : operations) {
+ if (operation == null || StringUtils.isEmpty(operation.getName())) {
+ continue;
+ }
+ String key = operation.getName();
+ if (columnMap.containsKey(key)) {
+ continue;
+ }
+ Map<String, Object> column = new LinkedHashMap<>();
+ column.put("key", key);
+ column.put("label", operation.getName());
+ column.put("standardQty", operation.getStandardQuantity() == null ? java.math.BigDecimal.ZERO : operation.getStandardQuantity());
+ columnMap.put(key, column);
+ }
+ } else {
+ List<Product> products = productMapper.selectList(
+ new LambdaQueryWrapper<Product>()
+ .isNotNull(Product::getParentId)
+ .orderByAsc(Product::getId));
+ for (Product product : products) {
+ if (product == null || StringUtils.isEmpty(product.getProductName())) {
+ continue;
+ }
+ if (isInstrumentProduct(product.getProductName())) {
+ continue;
+ }
+ String key = product.getProductName();
+ if (columnMap.containsKey(key)) {
+ continue;
+ }
+ Map<String, Object> column = new LinkedHashMap<>();
+ column.put("key", key);
+ column.put("label", product.getProductName());
+ column.put("standardQty", product.getStandardQuantity() == null ? java.math.BigDecimal.ZERO : product.getStandardQuantity());
+ columnMap.put(key, column);
+ }
+ }
+ return new ArrayList<>(columnMap.values());
+ }
+
+ private int[] buildWorkHourColumnWidths(int columnCount, boolean instrumentSheet) {
+ int baseSize = 2;
+ int total = baseSize + columnCount;
+ int[] widths = new int[total];
+ widths[0] = 16;
+ widths[1] = 14;
+ for (int i = 2; i < total; i++) {
+ widths[i] = 11;
+ }
+ return widths;
+ }
+
+ private java.math.BigDecimal calculateExportConvertedHours(java.math.BigDecimal foldedQty,
+ java.math.BigDecimal standardQty,
+ java.math.BigDecimal repairWorkHour) {
+ if (foldedQty == null || standardQty == null || standardQty.compareTo(java.math.BigDecimal.ZERO) <= 0) {
+ return repairWorkHour == null ? java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP)
+ : repairWorkHour.setScale(2, java.math.RoundingMode.HALF_UP);
+ }
+ return foldedQty.divide(standardQty, 8, java.math.RoundingMode.HALF_UP)
+ .multiply(new java.math.BigDecimal("8"))
+ .add(repairWorkHour == null ? java.math.BigDecimal.ZERO.setScale(2, java.math.RoundingMode.HALF_UP) : repairWorkHour.setScale(2, java.math.RoundingMode.HALF_UP))
+ .setScale(2, java.math.RoundingMode.HALF_UP);
}
@Override
@@ -560,10 +931,40 @@
cell.setCellStyle(style);
}
+ private void createEdgeCell(Workbook workbook,
+ Row row,
+ int colIndex,
+ String value,
+ CellStyle baseStyle,
+ boolean topBorder,
+ boolean bottomBorder,
+ boolean leftBorder,
+ boolean rightBorder) {
+ CellStyle edgeStyle = workbook.createCellStyle();
+ edgeStyle.cloneStyleFrom(baseStyle);
+ edgeStyle.setBorderTop(topBorder ? BorderStyle.THIN : BorderStyle.NONE);
+ edgeStyle.setBorderBottom(bottomBorder ? BorderStyle.THIN : BorderStyle.NONE);
+ edgeStyle.setBorderLeft(leftBorder ? BorderStyle.THIN : BorderStyle.NONE);
+ edgeStyle.setBorderRight(rightBorder ? BorderStyle.THIN : BorderStyle.NONE);
+ Cell cell = row.createCell(colIndex);
+ cell.setCellValue(value == null ? "" : value);
+ cell.setCellStyle(edgeStyle);
+ }
+
private void createNumberCell(Row row, int colIndex, java.math.BigDecimal value, CellStyle style) {
Cell cell = row.createCell(colIndex);
if (value != null) {
cell.setCellValue(value.doubleValue());
+ }
+ cell.setCellStyle(style);
+ }
+
+ private void createDisplayNumberCell(Row row, int colIndex, java.math.BigDecimal value, CellStyle style) {
+ Cell cell = row.createCell(colIndex);
+ if (value != null && value.compareTo(java.math.BigDecimal.ZERO) != 0) {
+ cell.setCellValue(value.doubleValue());
+ } else {
+ cell.setCellValue("");
}
cell.setCellStyle(style);
}
@@ -589,32 +990,66 @@
return sb.toString();
}
- private List<ProductionAccount> queryProductionAccounts(String salaryMonth) {
+ private List<ProductionProductMainDto> queryProductionDetails(String salaryMonth) {
if (StringUtils.isEmpty(salaryMonth)) {
return new ArrayList<>();
}
YearMonth ym = YearMonth.parse(salaryMonth);
LocalDate start = ym.atDay(1);
LocalDate end = ym.atEndOfMonth();
- return productionAccountMapper.selectList(new LambdaQueryWrapper<ProductionAccount>()
- .ge(ProductionAccount::getSchedulingDate, start.atStartOfDay())
- .le(ProductionAccount::getSchedulingDate, end.atTime(23, 59, 59)));
+ ProductionAccountDto dto = new ProductionAccountDto();
+ dto.setEntryDateStart(start);
+ dto.setEntryDateEnd(end);
+ dto.setAuditStatus(1);
+ Page<ProductionAccountDto> page = new Page<>(1, 100000);
+ return productionProductMainMapper.listProductionDetails(dto, page).getRecords();
}
- private Map<String, java.math.BigDecimal> buildOperationQuantityMap(List<ProductionAccount> accountList, String operationName) {
+ private Map<String, java.math.BigDecimal> buildOperationQuantityMap(List<ProductionProductMainDto> accountList, String operationName, TechnologyOperation operation) {
Map<String, java.math.BigDecimal> map = new LinkedHashMap<>();
if (CollectionUtils.isEmpty(accountList) || StringUtils.isEmpty(operationName)) {
return map;
}
accountList.stream()
- .filter(item -> item != null && operationName.equals(item.getTechnologyOperationName()))
+ .filter(item -> item != null && operationName.equals(item.getProcess()))
.filter(item -> StringUtils.isNotEmpty(item.getSchedulingUserName()))
.forEach(item -> map.merge(item.getSchedulingUserName(),
- item.getFinishedNum() == null ? java.math.BigDecimal.ZERO : item.getFinishedNum(),
+ calculateFoldedQuantity(item, operation),
java.math.BigDecimal::add));
return map;
}
+ private java.math.BigDecimal calculateSheetWage(TechnologyOperation operation,
+ String operationName,
+ java.math.BigDecimal qty,
+ java.math.BigDecimal standardQty) {
+ if (operation == null || qty == null) {
+ return java.math.BigDecimal.ZERO;
+ }
+ if (standardQty == null || standardQty.compareTo(java.math.BigDecimal.ZERO) <= 0) {
+ return java.math.BigDecimal.ZERO;
+ }
+ return qty.divide(standardQty, 2, java.math.RoundingMode.HALF_UP).multiply(new java.math.BigDecimal("8"));
+ }
+
+ private java.math.BigDecimal calculateFoldedQuantity(ProductionProductMainDto item, TechnologyOperation operation) {
+ if (item == null || operation == null) {
+ return java.math.BigDecimal.ZERO;
+ }
+ java.math.BigDecimal quantity = item.getQuantity() == null ? java.math.BigDecimal.ZERO : item.getQuantity();
+ String productName = item.getProductName();
+ if ("灏忔彁鐞�".equals(productName)) {
+ return operation.getViolinFactor() == null ? java.math.BigDecimal.ZERO : quantity.multiply(operation.getViolinFactor());
+ }
+ if ("澶ф彁鐞�".equals(productName)) {
+ return operation.getViolaFactor() == null ? java.math.BigDecimal.ZERO : quantity.multiply(operation.getViolaFactor());
+ }
+ if ("璐濇柉".equals(productName)) {
+ return operation.getBassFactor() == null ? java.math.BigDecimal.ZERO : quantity.multiply(operation.getBassFactor());
+ }
+ return java.math.BigDecimal.ZERO;
+ }
+
private Map<String, java.math.BigDecimal> buildStandardQuantityMap(List<String> operationNames) {
Map<String, java.math.BigDecimal> map = new LinkedHashMap<>();
if (CollectionUtils.isEmpty(operationNames)) {
--
Gitblit v1.9.3