bonus
/
yn_digital_gadgets_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
马三炮 2026-02-05 17:59:42 +08:00
parent 624502ec2e
commit fccf5fd96a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-business/src/main/java/com/bonus/digital/dao/SettlementVo.java
View File

@ -103,6 +103,11 @@ public class SettlementVo {
*/ */
private String inspectionStationName; private String inspectionStationName;
/**
* 单位名称
*/
private Integer inspectionStationId;
/** /**
* 合同名称 * 合同名称
*/ */

8
bonus-business/src/main/java/com/bonus/digital/service/impl/SettlementServiceImpl.java
View File

@ -223,7 +223,7 @@ public class SettlementServiceImpl implements SettlementService {
// 写入数据 // 写入数据
int colIndex = 0; int colIndex = 0;
Row row = sheet.createRow(rowNum++); Row row = sheet.createRow(rowNum++);
row.createCell(colIndex++).setCellValue(rowNum-3); row.createCell(colIndex++).setCellValue("");
row.createCell(colIndex++).setCellValue(vo.getInspectionStationName()); row.createCell(colIndex++).setCellValue(vo.getInspectionStationName());
row.createCell(colIndex++).setCellValue(vo.getContractPeriod()); row.createCell(colIndex++).setCellValue(vo.getContractPeriod());
row.createCell(colIndex++).setCellValue(vo.getContractName()); row.createCell(colIndex++).setCellValue(vo.getContractName());
@ -233,8 +233,8 @@ public class SettlementServiceImpl implements SettlementService {
row.createCell(colIndex++).setCellValue(executionPlanVo.getPlannedTime()); row.createCell(colIndex++).setCellValue(executionPlanVo.getPlannedTime());
row.createCell(colIndex++).setCellValue(executionPlanVo.getProjectCompletionTime()); row.createCell(colIndex++).setCellValue(executionPlanVo.getProjectCompletionTime());
row.createCell(colIndex++).setCellValue(executionPlanVo.getProjectSubSituation()); row.createCell(colIndex++).setCellValue(executionPlanVo.getProjectSubSituation());
row.createCell(colIndex++).setCellValue(executionPlanVo.getSubPersonnelCosts()); row.createCell(colIndex++).setCellValue(Double.parseDouble(executionPlanVo.getSubPersonnelCosts())/100);
row.createCell(colIndex++).setCellValue(executionPlanVo.getSubVehicleCosts()); row.createCell(colIndex++).setCellValue(Double.parseDouble(executionPlanVo.getSubVehicleCosts())/100);
row.createCell(colIndex++).setCellValue((double) vo.getEstimatedAmount() /1000000); row.createCell(colIndex++).setCellValue((double) vo.getEstimatedAmount() /1000000);
row.createCell(colIndex++).setCellValue(getStatus(vo.getSettlementStatus())); row.createCell(colIndex++).setCellValue(getStatus(vo.getSettlementStatus()));
row.createCell(colIndex++).setCellValue(vo.getSettlementBatch()); row.createCell(colIndex++).setCellValue(vo.getSettlementBatch());
@ -265,6 +265,8 @@ public class SettlementServiceImpl implements SettlementService {
// 检查是否已经存在重叠的合并区域，简单起见这里直接添加，实际项目中可增加校验逻辑 // 检查是否已经存在重叠的合并区域，简单起见这里直接添加，实际项目中可增加校验逻辑
sheet.addMergedRegion(new CellRangeAddress(stationStartRow, rowNum-1, 0, 0)); sheet.addMergedRegion(new CellRangeAddress(stationStartRow, rowNum-1, 0, 0));
sheet.getRow(stationStartRow).getCell(0).setCellValue(setValue); sheet.getRow(stationStartRow).getCell(0).setCellValue(setValue);
}else {
sheet.getRow(stationStartRow).getCell(0).setCellValue(setValue);
} }
setValue++; setValue++;
} }

1
bonus-business/src/main/resources/mapper/SettlementMapper.xml
View File

@ -102,6 +102,7 @@
ts.settlement_data_number, ts.settlement_data_number,
tc.contract_name, tc.contract_name,
tc.inspection_station_name, tc.inspection_station_name,
tc.inspection_station_id,
tc.contract_code, tc.contract_code,
tc.contract_period, tc.contract_period,
tc.contract_status tc.contract_status