Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 c8df02a7b07086e17bacda6cdc015d76ac1f82fe

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

@@ -16,9 +16,7 @@
import org.springframework.stereotype.Service;

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

/**
@@ -44,14 +42,23 @@
     */
    @Override
    public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
        contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId()));
        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;
    }

@@ -61,16 +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);
    }