修改，gis建模监管页，数据不一致问题

sgj

2026-03-17 74a25082f68c00a797a7eca8672cde8edb0dc95f

 fzzy-igdss-core/src/main/java/com/fzzy/igds/timer/JobWarnService.java

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

import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.PledgeReminders;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.FoodPrice;
import com.fzzy.igds.domain.PledgeContract;
@@ -15,9 +16,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * @Description 警告信息定时统计：还款提醒
@@ -25,7 +28,6 @@
 * @Date 2026/1/23 9:14
 */
@Slf4j

@Service
public class JobWarnService {

@@ -38,96 +40,127 @@
    @Resource
    private BizWorkService workService;


    /**
     * 每天两点执行：还款提醒
     */
//    @Scheduled(cron = "0 0 2 * * ?")
    @Scheduled(cron = "0 7 19 * * ?")
    @Scheduled(cron = "0 0 2 * * ?")
    public void timer() {
        doExe();
        doExe(null);
    }

    /**
     * 开始质押合同核算
     */
    public void doExe() {

        List<PledgeContract> contractList = contractService.getContractByPledge(new Date());
        if(null == contractList || contractList.isEmpty()){
    public void doExe(String bankId) {
        List<PledgeContract> contractList = contractService.getContractByPledge(new Date(), bankId);
        if (null == contractList || contractList.isEmpty()) {
            log.error("-----当前没有有效期的质押合同，不执行提醒核算-----");
            return;
        }

        Depot depot;
        FoodPrice foodPrice;
        WorkOrderConf conf;

        double sumMoney = 0.0;
        double per = 0.0;
        double backMoney = 0.0;
        for (PledgeContract pledgeContract : contractList) {
            log.info("-----开始处理质押合同：{}-----", pledgeContract.getContractName());
            log.info("-----开始处理质押合同：{}-----", pledgeContract.getName());
//            List<PledgeReminders> remindersList = new ArrayList<>();

            Map<String,PledgeReminders> remindersMap = new java.util.HashMap<>();


            //计算待还款金额
            backMoney = pledgeContract.getContractAmount() - pledgeContract.getRepaidAmount();
            if(backMoney <= 0.0){
            if (backMoney <= 0.0) {
                //若待还金额为0，则不统计此合同
                log.error("-----当前合同={}没有待还金额为{}，不执行提醒核算-----", pledgeContract.getContractName(), backMoney);
                log.error("-----当前合同={}没有待还金额为{}，不执行提醒核算-----", pledgeContract.getName(), backMoney);
                continue;
            }

            if(StringUtils.isBlank(pledgeContract.getPledgeBank())){
            if (StringUtils.isBlank(pledgeContract.getPledgeBank())) {
                //若质押银行未空，则跳过当前合同
                log.error("-----当前合同={}没有设置质押银行，不执行提醒核算-----", pledgeContract.getContractName());
                log.error("-----当前合同={}没有设置质押银行，不执行提醒核算-----", pledgeContract.getName());
                continue;
            }

            if(StringUtils.isBlank(pledgeContract.getDepotIds())){
            if (StringUtils.isBlank(pledgeContract.getDepotIds())) {
                //若质押仓库为空，则跳过当前合同
                log.error("-----当前合同={}没有设置质押仓库，不执行提醒核算-----", pledgeContract.getContractName());
                log.error("-----当前合同={}没有设置质押仓库，不执行提醒核算-----", pledgeContract.getName());
                continue;
            }

            String[] depotIds = pledgeContract.getDepotIds().split(",");
            if(depotIds.length < 1){
            if (depotIds.length < 1) {
                //若质押仓库为空，则跳过当前合同
                log.error("-----当前合同={}没有设置质押仓库，不执行提醒核算-----", pledgeContract.getContractName());
                log.error("-----当前合同={}没有设置质押仓库，不执行提醒核算-----", pledgeContract.getName());
                continue;
            }
            sumMoney = 0.0;
            for (String depotId : depotIds) {
                //查询仓库信息
                depot = depotService.getCacheDepot(pledgeContract.getCompanyId(), depotId);
                if(null == depot){
                    log.error("-----当前合同={}下仓库={}不存在，不统计此仓库-----", pledgeContract.getContractName(), depotId);
                if (null == depot) {
                    log.error("-----当前合同={}下仓库={}不存在，不统计此仓库-----", pledgeContract.getName(), depotId);
                    continue;
                }
                if(null == depot.getStorageReal()){
                if (null == depot.getStorageReal()) {
                    depot.setStorageReal(0.0);
                }

                foodPrice = foodPriceService.getDataByBankAndFood(pledgeContract.getPledgeBank(), depot.getFoodVariety());
                if(null == foodPrice || null == foodPrice.getPrice()){
                    log.error("-----当前合同={}下仓库={}对应的品种={}未配置价格，不统计此仓库-----", pledgeContract.getContractName(),depot.getName(), depot.getFoodVariety());
                if (null == foodPrice || null == foodPrice.getPrice()) {
                    log.error("-----当前合同={}下仓库={}对应的品种={}未配置价格，不统计此仓库-----", pledgeContract.getName(), depot.getName(), depot.getFoodVariety());
                    continue;
                }

                sumMoney += depot.getStorageReal() * foodPrice.getPrice();
            }
                //按品种+单价生成key，来作为唯一标识，统计粮食品种的库存量以及粮食品种信息
                String key=depot.getFoodVariety()+foodPrice.getPrice();
                PledgeReminders pledgeReminders = remindersMap.get(key);
                if (null == pledgeReminders) {
                    pledgeReminders = new PledgeReminders();
                    pledgeReminders.setFoodVariety(depot.getFoodVariety());
                    pledgeReminders.setFoodVarietyName(depot.getFoodVarietyName());
                    pledgeReminders.setFoodPrice(foodPrice.getPrice());
                    pledgeReminders.setStorageReal(pledgeReminders.getStorageReal()+depot.getStorageReal());

            per = sumMoney/backMoney;

            if(per <= 1.2){
                //执行流程
                conf = workService.getConfByDeptId(pledgeContract.getPledgeDept(), WorkBizType.TYPE_50);
                //流程不启用
                if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
                    log.error("-----当前合同={}质押库区={}未配置还款提醒审批流程，无法生成工单提醒-----", pledgeContract.getContractName(),pledgeContract.getPledgeDept());
                    continue;
                }else{
                    pledgeReminders.setStorageReal(pledgeReminders.getStorageReal()+depot.getStorageReal());
                }

                BaseResp resp = workService.startByBackMoney(pledgeContract, conf);
                log.info("---------当前合同={}启动还款提醒工单流程------{}",pledgeContract.getContractName(), resp);
                remindersMap.put(key,pledgeReminders);
//                PledgeReminders reminders = new PledgeReminders();
//                reminders.setDepotId(depot.getId());
//                reminders.setDepotName(depot.getName());
//                reminders.setFoodVariety(depot.getFoodVariety());
//                reminders.setFoodVarietyName(depot.getFoodVarietyName());
//                reminders.setFoodPrice(foodPrice.getPrice());
//                reminders.setStorageReal(depot.getStorageReal());
//                remindersList.add(reminders);
                log.info("-----当前合同={}下仓库={}：对应的实际储量={}，对应粮食单价={}-----", pledgeContract.getName(), depot.getName(), depot.getStorageReal(), foodPrice.getPrice());
            }

            per = sumMoney / backMoney;

            if (per > 1.1) {
                //货可以抵贷款
                log.error("-----当前合同={}下质押仓库={}库存未到待还款的110%，sumMoney={}，backMoney={}，不生成还款提醒工单-----", pledgeContract.getName(), pledgeContract.getDepotNames(), sumMoney, backMoney);
                continue;
            }
            //货不足以抵贷款 ,提醒企业补钱

            //执行流程
            conf = workService.getConfByDeptId(pledgeContract.getPledgeDept(), WorkBizType.TYPE_50);
            //流程不启用
            if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
                log.error("-----当前合同={}质押库区={}未配置还款提醒审批流程，无法生成工单提醒-----", pledgeContract.getName(), pledgeContract.getPledgeDept());
                continue;
            }

            BaseResp resp = workService.startByBackMoney(pledgeContract, conf,remindersMap);
            log.info("---------当前合同={}启动还款提醒工单流程------{}", pledgeContract.getName(), resp);
        }
    }