Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 863b22dd84364ef5a9c4d5057af5063f94e8f346

Merge remote-tracking branch 'origin/master'

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java

@@ -11,6 +11,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * 合同打分对象 t_default_score
@@ -40,7 +41,7 @@
    private Long ruleId;
    private String ruleIds;
    @TableField(exist = false)
    private Long[] ruleIdsArray;
    private List<String> ruleIdsArray;

    @Excel(name = "规则")
    private String ruleName;

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRuleCascaderVO.java

@@ -14,10 +14,8 @@
public class CalculateRuleCascaderVO extends TreeNode {
    private static final long serialVersionUID = 1L;

    private Long value;

    private String label;

    private String value;
    private String ruleName;

    /**

 ycl-pojo/src/main/java/com/ycl/system/domain/TreeNode.java

@@ -52,4 +52,4 @@
    public void setChildren(List<T> children) {
        this.children = children;
    }
}
}

 ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java

@@ -5,6 +5,7 @@
import com.ycl.platform.domain.vo.CalculateRuleCascaderVO;

import java.util.List;
import java.util.Map;

/**
 * 违约规则Service接口

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

@@ -11,7 +11,10 @@
import org.springframework.stereotype.Service;
import utils.DateUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 违约规则Service业务层处理
@@ -102,7 +105,17 @@
    }

    @Override
    public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
        return calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
    public  List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
        List<CalculateRuleCascaderVO> ruleListByUnitId = calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
        Map<String, List<CalculateRuleCascaderVO>> map = ruleListByUnitId.stream().collect(Collectors.groupingBy(CalculateRuleCascaderVO::getRuleName));
        List<CalculateRuleCascaderVO> result = new ArrayList<>();
        map.forEach((str,list)->{
            CalculateRuleCascaderVO vo = new CalculateRuleCascaderVO();
            vo.setValue(str);
            vo.setLabel(str);
            vo.setChildren(list);
            result.add(vo);
        });
        return result;
    }
}

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

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

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -50,8 +51,12 @@

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


 ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml

@@ -37,12 +37,11 @@

    <select id="getRuleListByUnitId" resultType="com.ycl.platform.domain.vo.CalculateRuleCascaderVO">
        <![CDATA[
        select id,
        select id as value,
               rule_name,
               deduct_category,
               calc_fraction,
               calc_unit,
               id as value,
               contract_id,
               rule_condition as label
        from t_calculate_rule