blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zxl
2025-05-26 ee03b526152d335dd1e42bc01a1f717d1205204c 
 ycl-server/src/main/java/com/ycl/task/ContractResultTask.java


@@ -1,22 +1,24 @@


package com.ycl.task;




import com.ycl.platform.domain.entity.ContractResult;


import com.ycl.platform.domain.entity.ContractResultRecord;


import com.ycl.platform.domain.entity.ContractScore;


import com.ycl.platform.domain.entity.TContract;


import com.ycl.platform.domain.entity.*;


import com.ycl.platform.mapper.CalculateRecordMapper;


import com.ycl.platform.service.CalculateRecordService;


import com.ycl.platform.service.IContractResultService;


import com.ycl.platform.service.IContractScoreService;


import com.ycl.platform.service.ITContractService;


import com.ycl.utils.DateUtils;


import com.ycl.utils.bean.BeanUtils;


import enumeration.general.CalculateReportStatusEnum;


import enumeration.general.PublishType;


import lombok.Data;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;


import org.springframework.transaction.annotation.Transactional;




import java.math.BigDecimal;


import java.time.LocalDate;


import java.time.format.DateTimeFormatter;


import java.util.Calendar;


import java.util.Date;


import java.util.List;




/**


@@ -24,23 +26,21 @@


 * @since 2024/4/28 下午 4:14


 */




@Component


@Data


@Component("contractResultTask")


public class ContractResultTask {




    private final ITContractService contractService;


    private final IContractScoreService contractScoreService;


    private final IContractResultService checkResultService;




    private final CalculateRecordMapper calculateRecordMapper;


    private String startTime;


    private String endTime;




    /**


     * 每个月1号执行，统计考核结果


     */


    @Scheduled(cron = "0 0 0 1 * ?")


    @Transactional


    // @PostConstruct //启动时执行一次


    public void contractResultTask() {


        // 查询有效期内的合同


        List<TContract> list = contractService.selectUsingContract();


@@ -49,11 +49,28 @@


            // 上个月扣分记录


            List<ContractScore> contractScore = contractScoreService.getDateRangeScoreByContractId(tContract.getId(), startTime, endTime);


            // 新增考核结果


            //获取上个月时间


            Calendar calendar = Calendar.getInstance();


            calendar.add(Calendar.MONTH, -1);


            ContractResult contractResult = getCheckResult(tContract, contractScore);


            contractResult.setWhichMonth(calendar.get(Calendar.MONTH)+1);


            contractResult.setWhichYear(calendar.get(Calendar.YEAR));


            checkResultService.save(contractResult);


            // 新增考核结果记录


            List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);


            checkResultService.saveBatchRecord(contractResultRecord);


//            // 新增考核结果记录


//            List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);


//            checkResultService.saveBatchRecord(contractResultRecord);


            // 新增核算明细记录


            CalculateRecord calculateRecord = new CalculateRecord();


            //改为直接去查


//            calculateRecord.setScore(contractResult.getScore());


            calculateRecord.setContractId(Integer.parseInt(tContract.getId()+""));


            calculateRecord.setCreateTime(new Date());


            calculateRecord.setUpdateTime(new Date());


            calculateRecord.setStatus(PublishType.UNPUBLISHED.getCode());




            calculateRecord.setWhichYear(calendar.get(Calendar.YEAR));


            calculateRecord.setWhichMonth(calendar.get(Calendar.MONTH)+1);


            calculateRecordMapper.insert(calculateRecord);


        }


    }




@@ -88,9 +105,9 @@


        contractResult.setUnitId(tContract.getUnitId());


        contractResult.setContractId(tContract.getId());


        contractResult.setPublish(0);


        contractResult.setDeleted("0");


        contractResult.setCheckTime(DateUtils.getNowDate());


        contractResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));


        //改为直接去查


//        contractResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));


        return contractResult;


    }