From 5777b0803509008e638e747eca5408f82ffbc8bf Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 25 四月 2024 18:05:45 +0800
Subject: [PATCH] 合同积分新增、查询、修改、审核、删除、导出
---
ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java
index 6a479fc..b9a4395 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java
@@ -6,14 +6,18 @@
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
+import com.ycl.utils.DateUtils;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
+import enumeration.general.AuditingStatus;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍚堝悓鎵撳垎Controller
@@ -23,8 +27,7 @@
*/
@RestController
@RequestMapping("/contract/score")
-public class ContractScoreController extends BaseController
-{
+public class ContractScoreController extends BaseController {
@Autowired
private IContractScoreService defaultScoreService;
@@ -32,9 +35,8 @@
* 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('platform:score:list')")
- @GetMapping("/list")
- public TableDataInfo list(ContractScore contractScore)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody ContractScore contractScore) {
startPage();
List<ContractScore> list = defaultScoreService.selectDefaultScoreList(contractScore);
return getDataTable(list);
@@ -44,12 +46,10 @@
* 瀵煎嚭鍚堝悓鎵撳垎鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('platform:score:export')")
- @Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ContractScore contractScore)
- {
+ public void export(HttpServletResponse response, ContractScore contractScore) {
List<ContractScore> list = defaultScoreService.selectDefaultScoreList(contractScore);
- ExcelUtil<ContractScore> util = new ExcelUtil<ContractScore>(ContractScore.class);
+ ExcelUtil<ContractScore> util = new ExcelUtil<>(ContractScore.class);
util.exportExcel(response, list, "鍚堝悓鎵撳垎鏁版嵁");
}
@@ -58,9 +58,10 @@
*/
@PreAuthorize("@ss.hasPermi('platform:score:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(defaultScoreService.selectDefaultScoreById(id));
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ ContractScore contractScore = defaultScoreService.getById(id);
+ contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
+ return success(contractScore);
}
/**
@@ -69,9 +70,13 @@
@PreAuthorize("@ss.hasPermi('platform:score:add')")
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ContractScore contractScore)
- {
- return toAjax(defaultScoreService.insertDefaultScore(contractScore));
+ public AjaxResult add(@RequestBody ContractScore contractScore) {
+ contractScore.setCreateUserId(getUserId());
+ contractScore.setCreateUser(getUsername());
+ contractScore.setAuditingStatus(AuditingStatus.WAIT);
+ contractScore.setDeleted("0");
+ contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
+ return toAjax(defaultScoreService.save(contractScore));
}
/**
@@ -80,9 +85,23 @@
@PreAuthorize("@ss.hasPermi('platform:score:edit')")
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ContractScore contractScore)
- {
- return toAjax(defaultScoreService.updateDefaultScore(contractScore));
+ public AjaxResult edit(@RequestBody ContractScore contractScore) {
+ contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
+ return toAjax(defaultScoreService.updateById(contractScore));
+ }
+
+ /**
+ * 鍚堝悓鎵撳垎瀹℃牳
+ */
+ @PreAuthorize("@ss.hasPermi('platform:score:audit')")
+ @Log(title = "鍚堝悓鎵撳垎瀹℃牳", businessType = BusinessType.UPDATE)
+ @PostMapping("/auditing")
+ public AjaxResult audit(@RequestBody ContractScore contractScore) {
+ contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
+ contractScore.setAuditingTime(DateUtils.getNowDate());
+ contractScore.setAuditingUser(getUsername());
+ contractScore.setAuditingUserId(getUserId());
+ return toAjax(defaultScoreService.updateById(contractScore));
}
/**
@@ -90,9 +109,8 @@
*/
@PreAuthorize("@ss.hasPermi('platform:score:remove')")
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(defaultScoreService.deleteDefaultScoreByIds(ids));
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(defaultScoreService.removeBatchByIds(Arrays.asList(ids)));
}
}
--
Gitblit v1.8.0