From eb806b5ec0bb72536e78c1a7fcffb94bcd24cbbe Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 26 四月 2024 18:24:27 +0800
Subject: [PATCH] 考核结果应用规则（算钱）新增、展示
---
ycl-server/src/main/java/com/ycl/platform/controller/ContractScoreController.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 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 b9a4395..298cf96 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,10 +6,8 @@
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;
@@ -17,7 +15,6 @@
import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 鍚堝悓鎵撳垎Controller
@@ -59,9 +56,7 @@
@PreAuthorize("@ss.hasPermi('platform:score:query')")
@GetMapping(value = "/{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);
+ return success(defaultScoreService.getById(id));
}
/**
@@ -71,11 +66,6 @@
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.INSERT)
@PostMapping
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));
}
@@ -86,7 +76,6 @@
@Log(title = "鍚堝悓鎵撳垎", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ContractScore contractScore) {
- contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
return toAjax(defaultScoreService.updateById(contractScore));
}
@@ -97,11 +86,7 @@
@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));
+ return toAjax(defaultScoreService.audit(contractScore));
}
/**
--
Gitblit v1.8.0