From 80ee9e60a775f5e203c02608c93cd624201b3cab Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期二, 24 十二月 2024 10:53:22 +0800
Subject: [PATCH] feat: 备注完善
---
land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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..c98f8ac 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
@@ -20,6 +20,7 @@
import com.zzg.system.service.state.StateSettlementService;
import com.zzg.system.service.system.ISysDeptService;
import com.zzg.web.core.enums.TemplateFileTypeEnum;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -43,34 +44,35 @@
public class StateSettlementController {
private final StateSettlementService settlementService;
- private final StateHouseholdService stateHouseholdService;
private final ISysDeptService deptService;
+ @ApiOperation(value = "安置情况保存", notes = "安置情况保存")
@PostMapping(UrlConstants.STATE_SETTLEMENT_SAVE)
public AjaxResult<List<StateSettlement>> saveSettlement(@RequestBody List<StateSettlement> stateSettlement) {
settlementService.saveOrUpdateSettlement(stateSettlement);
return AjaxResult.success(stateSettlement);
}
+ @ApiOperation(value = "安置情况删除", notes = "安置情况删除")
@GetMapping(UrlConstants.STATE_SETTLEMENT_DEL)
public AjaxResult<Boolean> delSettlement(@RequestParam String settlementId) {
settlementService.deleteSettlement(settlementId);
return AjaxResult.success(true);
}
- //安置详情
+ @ApiOperation(value = "安置详情", notes = "安置详情")
@PostMapping(UrlConstants.STATE_SETTLEMENT_DETAIL_LIST)
public AjaxResult<SettlementDetailPageVO> listSettlementDetail(@RequestBody SettlementDetailBO settlementBO) {
return AjaxResult.success(settlementService.listDetailData(settlementBO));
}
- //安置详情
+ @ApiOperation(value = "安置详情-回显", notes = "安置详情-回显")
@PostMapping(UrlConstants.STATE_SETTLEMENT_DETAIL_UPDATE_LIST)
public AjaxResult<SettlementDetailPageVO> listSettlementDetailUpdate(@RequestBody SettlementDetailBO settlementBO) {
return AjaxResult.success(settlementService.listDetailUpdateData(settlementBO));
}
- //外层项目实施数据
+ @ApiOperation(value = "外层项目实施数据", notes = "外层项目实施数据")
@GetMapping(UrlConstants.STATE_SETTLEMENT_SUM)
public AjaxResult<SettlementSumVO> sumSettled(@RequestParam String projectId) {
return AjaxResult.success(settlementService.sumSettleData(projectId));
@@ -85,7 +87,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 +192,6 @@
@PostMapping(UrlConstants.STATE_SETTLEMENT_IMPORT)
public AjaxResult<Void> importSettlement(ImportSettlementBO importSettlementBO) throws IOException {
-
settlementService.stateSettlementImport(importSettlementBO);
return AjaxResult.success();
@@ -214,7 +214,6 @@
return AjaxResult.error();
}
}
-
//项目实施明细
@PostMapping(UrlConstants.STATE_EXECUTION_DETAIL)
@@ -249,7 +248,7 @@
/**
* @param projectId
- * @param componsationType 前端传 “null” 无办法
+ * @param componsationType
* @return
*/
@GetMapping(UrlConstants.STATE_SETTLEMENT_GENERATE_SETTLE_BATCH)
@@ -261,7 +260,6 @@
public AjaxResult<List<String>> listBatchName(@RequestParam String projectId) {
return AjaxResult.success(settlementService.listBatchName(projectId));
}
-
}
--
Gitblit v1.7.1