Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 c8df02a7b07086e17bacda6cdc015d76ac1f82fe

 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java

@@ -11,12 +11,12 @@
import com.ycl.system.entity.SysUser;
import com.ycl.utils.SecurityUtils;
import enumeration.general.AuditingStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -26,15 +26,13 @@
 * @date 2024-04-01
 */
@Service
@RequiredArgsConstructor
public class ContractScoreServiceImpl extends ServiceImpl<ContractScoreMapper, ContractScore> implements IContractScoreService {
    @Autowired
    private ContractScoreMapper contractScoreMapper;
    @Autowired
    private YwUnitMapper ywunitMapper;
    @Autowired
    private TContractMapper contractMapper;
    @Autowired
    private CalculateRuleMapper calculateRuleMapper;

    private final ContractScoreMapper contractScoreMapper;
    private final YwUnitMapper ywunitMapper;
    private final TContractMapper contractMapper;
    private final CalculateRuleMapper calculateRuleMapper;

    /**
     * 查询合同打分列表
@@ -44,13 +42,23 @@
     */
    @Override
    public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
        Integer unitId = SecurityUtils.getUnitId();
        Long uid = null;
        if (Objects.nonNull(unitId)) {
            uid = Long.valueOf(unitId);
        }
        contractScore.setUnitId(uid);
        return contractScoreMapper.selectDefaultScoreList(contractScore);
    }

    @Override
    public ContractScore getById(Serializable id) {
        //TODO:回显优化
        ContractScore contractScore = super.getById(id);
        contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
        List<String> ruleIds = new ArrayList<>();
        ruleIds.add(contractScore.getRuleName().split("/")[0].trim());
        ruleIds.add(contractScore.getRuleId()+"");
        contractScore.setRuleIdsArray(ruleIds);
        return contractScore;
    }

@@ -60,14 +68,17 @@
        contractScore.setCreateUserId(user.getUserId());
        contractScore.setCreateUser(user.getNickName());
        contractScore.setAuditingStatus(AuditingStatus.WAIT);
        contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
        contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
//        contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
//        contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
        contractScore.setUpdateTime(new Date());
        return super.save(contractScore);
    }

    @Override
    public boolean updateById(ContractScore contractScore) {
        contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
        contractScore.setRuleId(Long.parseLong(contractScore.getRuleIdsArray().get(1)));
        contractScore.setUpdateTime(new Date());
        contractScore.setAuditingStatus(AuditingStatus.WAIT);
        return super.updateById(contractScore);
    }