Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-29 ad31fa93abe524baec2216f9b2f203acb8cc2d6a

Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,8 @@

    private String label;

    private String ruleName;

    /**
     * 扣分方式
     */

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

@@ -7,7 +7,6 @@
import com.ycl.platform.mapper.CalculateRuleMapper;
import com.ycl.platform.mapper.TContractMapper;
import com.ycl.platform.service.ICalculateRuleService;
import com.ycl.system.domain.TreeUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
@@ -104,6 +103,6 @@

    @Override
    public List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId) {
        return TreeUtils.build(calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate()), 0L);
        return calculateRuleMapper.getRuleListByUnitId(unitId, DateUtils.getDate());
    }
}

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

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.mapper.CalculateRuleMapper;
import com.ycl.platform.mapper.ContractScoreMapper;
@@ -63,8 +62,6 @@
        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));
        List<CalculateRule> list = new LambdaQueryChainWrapper<>(calculateRuleMapper).in(CalculateRule::getId, contractScore.getRuleIdsArray()).list();
        contractScore.setRuleName(String.join(" / ", new String[]{list.get(0).getRuleName(), list.get(2).getRuleCondition()}));
        return super.save(contractScore);
    }


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

@@ -36,18 +36,20 @@
    </select>

    <select id="getRuleListByUnitId" resultType="com.ycl.platform.domain.vo.CalculateRuleCascaderVO">
        <![CDATA[
        select id,
               rule_name,
               deduct_category,
               calc_fraction,
               calc_unit,
               id as value,
               contract_id,
               if(rule_condition is not null, rule_condition, if(rule_desc is not null, rule_desc, rule_name)) as label,
               parent_id
               rule_condition as label
        from t_calculate_rule
        where deleted = 0
          and contract_id
            in (select id from t_contract where unit_id = #{unitId} and deleted = 0 and start_time <![CDATA[ <=  ]]> #{now} and end_time >= #{now} )
            in (select id from t_contract where unit_id = #{unitId} and deleted = 0 and start_time <= #{now} and end_time >= #{now})
        ]]>
    </select>

    <insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">