diff --git a/bonus-business/src/main/java/com/bonus/digital/dao/SettlementVo.java b/bonus-business/src/main/java/com/bonus/digital/dao/SettlementVo.java index c854acd..b9965eb 100644 --- a/bonus-business/src/main/java/com/bonus/digital/dao/SettlementVo.java +++ b/bonus-business/src/main/java/com/bonus/digital/dao/SettlementVo.java @@ -103,6 +103,11 @@ public class SettlementVo { */ private String inspectionStationName; + /** + * 单位名称 + */ + private Integer inspectionStationId; + /** * 合同名称 */ diff --git a/bonus-business/src/main/java/com/bonus/digital/service/impl/SettlementServiceImpl.java b/bonus-business/src/main/java/com/bonus/digital/service/impl/SettlementServiceImpl.java index 12baf58..aaaf26d 100644 --- a/bonus-business/src/main/java/com/bonus/digital/service/impl/SettlementServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/digital/service/impl/SettlementServiceImpl.java @@ -223,7 +223,7 @@ public class SettlementServiceImpl implements SettlementService { // 写入数据 int colIndex = 0; 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.getContractPeriod()); 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.getProjectCompletionTime()); row.createCell(colIndex++).setCellValue(executionPlanVo.getProjectSubSituation()); - row.createCell(colIndex++).setCellValue(executionPlanVo.getSubPersonnelCosts()); - row.createCell(colIndex++).setCellValue(executionPlanVo.getSubVehicleCosts()); + row.createCell(colIndex++).setCellValue(Double.parseDouble(executionPlanVo.getSubPersonnelCosts())/100); + row.createCell(colIndex++).setCellValue(Double.parseDouble(executionPlanVo.getSubVehicleCosts())/100); row.createCell(colIndex++).setCellValue((double) vo.getEstimatedAmount() /1000000); row.createCell(colIndex++).setCellValue(getStatus(vo.getSettlementStatus())); 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.getRow(stationStartRow).getCell(0).setCellValue(setValue); + }else { + sheet.getRow(stationStartRow).getCell(0).setCellValue(setValue); } setValue++; } diff --git a/bonus-business/src/main/resources/mapper/SettlementMapper.xml b/bonus-business/src/main/resources/mapper/SettlementMapper.xml index 613170e..a09a295 100644 --- a/bonus-business/src/main/resources/mapper/SettlementMapper.xml +++ b/bonus-business/src/main/resources/mapper/SettlementMapper.xml @@ -102,6 +102,7 @@ ts.settlement_data_number, tc.contract_name, tc.inspection_station_name, + tc.inspection_station_id, tc.contract_code, tc.contract_period, tc.contract_status