Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 68a32aa05a22070c048d67ab056f40be86222450

 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
@@ -34,7 +31,7 @@
    /**
     * 查询合同打分列表
     */
    @PreAuthorize("@ss.hasPermi('platform:score:list')")
    @PreAuthorize("@ss.hasPermi('contract:score:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody ContractScore contractScore) {
        startPage();
@@ -45,7 +42,7 @@
    /**
     * 导出合同打分列表
     */
    @PreAuthorize("@ss.hasPermi('platform:score:export')")
    @PreAuthorize("@ss.hasPermi('contract:score:export')")
    @PostMapping("/export")
    public void export(HttpServletResponse response, ContractScore contractScore) {
        List<ContractScore> list = defaultScoreService.selectDefaultScoreList(contractScore);
@@ -56,58 +53,46 @@
    /**
     * 获取合同打分详细信息
     */
    @PreAuthorize("@ss.hasPermi('platform:score:query')")
    @PreAuthorize("@ss.hasPermi('contract: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));
    }

    /**
     * 新增合同打分
     */
    @PreAuthorize("@ss.hasPermi('platform:score:add')")
    @PreAuthorize("@ss.hasPermi('contract:score:add')")
    @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));
    }

    /**
     * 修改合同打分
     */
    @PreAuthorize("@ss.hasPermi('platform:score:edit')")
    @PreAuthorize("@ss.hasPermi('contract:score:edit')")
    @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));
    }

    /**
     * 合同打分审核
     */
    @PreAuthorize("@ss.hasPermi('platform:score:audit')")
    @PreAuthorize("@ss.hasPermi('contract: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));
        return toAjax(defaultScoreService.audit(contractScore));
    }

    /**
     * 删除合同打分
     */
    @PreAuthorize("@ss.hasPermi('platform:score:remove')")
    @PreAuthorize("@ss.hasPermi('contract:score:remove')")
    @Log(title = "合同打分", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {