OSD宇视bug，工单删除、工单导出时间bug等等

fuliqi

2024-11-07 3403a2462434da327d89311b4b9a75ab7a9b5c0f

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

@@ -9,16 +9,15 @@
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.system.entity.SysUser;
import com.ycl.utils.DateUtils;
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.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -28,15 +27,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;

    /**
     * 查询合同打分列表
@@ -46,11 +43,34 @@
     */
    @Override
    public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
        //避免搜索条件失效
        if(contractScore.getUnitId()==null) {
            //TODO:数据权限(暂时不知道要不要数据权限)
            Integer unitId = SecurityUtils.getUnitId();
            Long uid = null;
            if (Objects.nonNull(unitId)) {
                uid = Long.valueOf(unitId);
            }
            contractScore.setUnitId(uid);
        }
        if(contractScore.getCreateStartTime()!=null) {
            contractScore.setCreateStartTime(DateUtils.getDayStart(contractScore.getCreateStartTime()));
        }
        if(contractScore.getCreateEndTime()!=null) {
            contractScore.setCreateEndTime(DateUtils.getDayStart(contractScore.getCreateEndTime()));
        }
        if(contractScore.getAuditingStartTime()!=null) {
            contractScore.setAuditingStartTime(DateUtils.getDayStart(contractScore.getAuditingStartTime()));
        }
        if(contractScore.getAuditingEndTime()!=null) {
            contractScore.setAuditingEndTime(DateUtils.getDayStart(contractScore.getAuditingEndTime()));
        }
        return contractScoreMapper.selectDefaultScoreList(contractScore);
    }

    @Override
    public ContractScore getById(Serializable id) {
        //TODO:回显优化
        ContractScore contractScore = super.getById(id);
        List<String> ruleIds = new ArrayList<>();
        ruleIds.add(contractScore.getRuleName().split("/")[0].trim());