Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-04 c8df02a7b07086e17bacda6cdc015d76ac1f82fe

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

@@ -1,6 +1,5 @@
package com.ycl.platform.service.impl;

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.ContractResult;
@@ -9,15 +8,15 @@
import com.ycl.platform.mapper.ContractResultMapper;
import com.ycl.platform.mapper.ContractResultRecordMapper;
import com.ycl.platform.service.IContractResultService;
import com.ycl.platform.service.ITContractService;
import com.ycl.platform.service.YwUnitService;
import com.ycl.utils.SecurityUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;

/**
 * 考核结果Service业务层处理
@@ -26,11 +25,11 @@
 * @date 2024-04-01
 */
@Service
@RequiredArgsConstructor
public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService {
    @Autowired
    private ContractResultMapper checkResultMapper;
    @Autowired
    private ContractResultRecordMapper contractResultRecordMapper;

    private final ContractResultMapper checkResultMapper;
    private final ContractResultRecordMapper contractResultRecordMapper;


    /**
@@ -52,6 +51,12 @@
     */
    @Override
    public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) {
        Integer unitId = SecurityUtils.getUnitId();
        Long uid = null;
        if (Objects.nonNull(unitId)) {
            uid = Long.valueOf(unitId);
        }
        contractResult.setUnitId(uid);
        return checkResultMapper.selectCheckResultList(contractResult);
    }

@@ -108,10 +113,8 @@
    }

    @Override
    public List<ContractResultRecord> selectCheckResultRecordList(Long resultId) {
        return new LambdaQueryChainWrapper<>(contractResultRecordMapper)
                .eq(ContractResultRecord::getResultId, resultId)
                .list();
    public List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId) {
        return checkResultMapper.selectCheckResultRecordList(resultId, contractId);
    }

    @Override