From e3cf8e216328e113d7cf05cba34f5a0af3865338 Mon Sep 17 00:00:00 2001 From: yanghb <yangbhwork@163.com> Date: 星期二, 24 十二月 2024 10:49:01 +0800 Subject: [PATCH] feat: 备注完善 --- land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java b/land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java index 37997b3..9ed5d64 100644 --- a/land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java +++ b/land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java @@ -43,7 +43,6 @@ public class StateSettlementController { private final StateSettlementService settlementService; - private final StateHouseholdService stateHouseholdService; private final ISysDeptService deptService; @PostMapping(UrlConstants.STATE_SETTLEMENT_SAVE) @@ -85,7 +84,6 @@ public AjaxResult<Void> exportSettlement(@RequestBody SettlementBO settlementBO, HttpServletResponse response) { try { List<HouseholdVO> result = settlementService.exportSettleData(settlementBO, response); - if (Objects.equals(settlementBO.getIsSettled(), SettledProcessEnum.NOT_SETTLE.getValue())) { List<NotResettlementHouseholdExportVO> exportVOList = StateProjectConvert.INSTANCE.toNotResettlementHouseholdExportVO(result); List<String> deptIdList = exportVOList.stream() @@ -191,7 +189,6 @@ @PostMapping(UrlConstants.STATE_SETTLEMENT_IMPORT) public AjaxResult<Void> importSettlement(ImportSettlementBO importSettlementBO) throws IOException { - settlementService.stateSettlementImport(importSettlementBO); return AjaxResult.success(); @@ -214,7 +211,6 @@ return AjaxResult.error(); } } - //项目实施明细 @PostMapping(UrlConstants.STATE_EXECUTION_DETAIL) @@ -249,7 +245,7 @@ /** * @param projectId - * @param componsationType 前端传 “null” 无办法 + * @param componsationType * @return */ @GetMapping(UrlConstants.STATE_SETTLEMENT_GENERATE_SETTLE_BATCH) @@ -261,7 +257,6 @@ public AjaxResult<List<String>> listBatchName(@RequestParam String projectId) { return AjaxResult.success(settlementService.listBatchName(projectId)); } - } -- Gitblit v1.7.1