质押还款提醒文案调整

sgj

2026-03-12 533c9a4e44b06c90df7434a38e0da26e10cdac46

质押还款提醒文案调整

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/PledgeReminders.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.fzzy.igds.data;


import lombok.Data;

/**
 * è´¨æŠ¼åˆåŒæé†’
 *
 * @author sgj
 * @since 2026/03/12

 */
@Data
public class PledgeReminders {

    //仓库ID
    private String depotId;

    //仓库名称
    private String depotName;

    //粮食品种
    private String foodVariety;

    //品种名称
    private String foodVarietyName;

    //粮食单价
    private Double foodPrice;

    //实际库存
    private Double storageReal;


}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/FoodPriceService.java

@@ -55,8 +55,10 @@
     * @return
     */
    public FoodPrice getDataByBankAndFood(String bankId, String foodVariety) {
        if(StringUtils.isBlank(bankId) || StringUtils.isBlank(foodVariety)  ){
            return null;
        }
        SysUser user = ContextUtil.getLoginUser();

        QueryWrapper<FoodPrice> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("bank_id", bankId);
        queryWrapper.eq("food_variety", foodVariety);

 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;
@@ -17,6 +18,7 @@
import org.springframework.stereotype.Service;

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

@@ -38,6 +40,7 @@
    @Resource
    private BizWorkService workService;


    /**
     * æ¯å¤©ä¸¤ç‚¹æ‰§è¡Œï¼šè¿˜æ¬¾æé†’
     */
@@ -58,11 +61,14 @@
        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.getName());
            List<PledgeReminders> remindersList = new ArrayList<>();


            //计算待还款金额
            backMoney = pledgeContract.getContractAmount() - pledgeContract.getRepaidAmount();
@@ -109,6 +115,14 @@
                }

                sumMoney += depot.getStorageReal() * foodPrice.getPrice();
                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());
            }

@@ -127,7 +141,7 @@
                continue;
            }

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

 fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.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.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.domain.PledgeContract;
@@ -18,7 +19,9 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.DecimalFormat;
import java.util.Date;
import java.util.List;

/**
 * @Desc: å·¥å•ä¸šåŠ¡æŽ¥å£
@@ -28,6 +31,7 @@
@Slf4j
@Service
public class BizWorkService {

    @Resource
    private WorkOrderConfService confService;
    @Resource
@@ -38,8 +42,9 @@

    /**
     * èŽ·å–流程配置信息
     *
     * @param deptId åº“区ID
     * @param type  ä¸šåŠ¡ç±»åž‹
     * @param type   ä¸šåŠ¡ç±»åž‹
     * @return é…ç½®ä¿¡æ¯
     */
    public WorkOrderConf getConfByDeptId(String deptId, WorkBizType type) {
@@ -49,6 +54,7 @@
    /**
     *
     * æ ¹æ®å‡ºå…¥åº“通知单启动审批工单
     *
     * @param data å‡ºå…¥åº“工单数据
     * @return å“åº”结果
     */
@@ -69,7 +75,7 @@
        work.setDeptId(data.getDeptId());
        work.setCompanyId(data.getCompanyId());
        work.setUpdateTime(new Date());
        work.setTitle(data.getName()+"-审批");
        work.setTitle(data.getName() + "-审批");
        work.setConfId(conf.getId());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());
@@ -95,6 +101,7 @@
    /**
     *
     * æ ¹æ®å‡ºå‡ºåº“通知单启动审批工单
     *
     * @param data å‡ºå…¥åº“工单数据
     * @return å“åº”结果
     */
@@ -114,7 +121,7 @@
        work.setDeptId(data.getDeptId());
        work.setCompanyId(data.getCompanyId());
        work.setUpdateTime(new Date());
        work.setTitle(data.getName()+"-审批");
        work.setTitle(data.getName() + "-审批");
        work.setConfId(conf.getId());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());
@@ -139,6 +146,7 @@

    /**
     * æ ¹æ®å½“前节点获取下一个节点
     *
     * @param curNode
     * @param conf
     * @return
@@ -168,16 +176,30 @@
    /**
     *
     * æ ¹æ®å‡ºå…¥åº“通知单启动审批工单
     *
     * @param data å‡ºå…¥åº“工单数据
     * @return å“åº”结果
     */
    public BaseResp startByBackMoney(PledgeContract data, WorkOrderConf conf) {
    public BaseResp startByBackMoney(PledgeContract data, WorkOrderConf conf, List<PledgeReminders> remindersList) {

        if (null == conf) conf = confService.getByDeptId(data.getPledgeDept(), WorkBizType.TYPE_10);

        if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("流程未启用");

        //创建工单
        StringBuilder description = new StringBuilder("当前合同<" + data.getName() + ">下");
        if (!remindersList.isEmpty()) {
            Double sumMoneyNum = 0.0;
            DecimalFormat df = new DecimalFormat("0.00");

            for (PledgeReminders reminders : remindersList) {
                description.append("，仓库<").append(reminders.getDepotName()).append(">，质押物<").append(reminders.getFoodVarietyName()).append(">库存量为").append(df.format(reminders.getStorageReal())).append("kg，单价").append(reminders.getFoodPrice()).append("元，");
                sumMoneyNum += reminders.getStorageReal() * reminders.getFoodPrice();
            }
            description.append("库存量总金额为").append(df.format(sumMoneyNum)).append("元，达到合同待还款金额的110%,请提醒企业进款还款");
        } else {
            description.append("质押仓库<").append(data.getDepotNames()).append(">库存量金额高于待还款金额，需要进行还款");
        }
        WorkOrder work = new WorkOrder();
        work.setId(ContextUtil.generateOrderId("WARN"));
        work.setBizType(WorkBizType.TYPE_50.getCode());
@@ -192,9 +214,7 @@
        work.setConfId(conf.getId());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());

        work.setDescription("当前合同<" + data.getName() + ">下质押仓库<" + data.getDepotNames() + ">库存量金额高于待还款金额，需要进行还款！");

        work.setDescription(description.toString());
        work.setCreateBy("系统生成");
        work.setCreateById("sys");
        work.setUpdateBy("系统生成");
@@ -219,6 +239,7 @@

    /**
     * èŽ·å–待处理工单
     *
     * @return å¤„理结果
     */
    public BaseResp todoByProcess(WorkOrderProcess process) {
@@ -238,7 +259,6 @@
            return BaseResp.error("当前工单已处理，请刷新页面重试！！");
        }


        //判断是不是指定处理人
        SysUser user = ContextUtil.getLoginUser();
        if (StringUtils.isNotEmpty(work.getAssigneeId())) {
@@ -256,7 +276,6 @@
        //获取配置信息
        WorkOrderConf conf = confService.selectById(work.getConfId());
        if (null == conf) return BaseResp.error("当前工单未配置流程");


        //添加记录
        process.setId(ContextUtil.UUID());
@@ -280,7 +299,7 @@
                work.setAssigneeId(process.getAssigneeId());
                work.setNode(nextNode.getCode());
                orderService.complete(work);
            }else{
            } else {
                work.setNode(nextNode.getCode());
                work.setStatus(WorkStatus.STATUS_30.getCode());
                orderService.updateData(work);
@@ -299,7 +318,7 @@
            work.setStatus(WorkStatus.STATUS_60.getCode());

            orderService.complete(work);
            

            //增加审批记录
            orderProcessService.addData(process, true);

@@ -314,7 +333,6 @@

//            work.setAssigneeName(process.getAssigneeName());
//            work.setAssigneeId(process.getAssigneeId());


            orderService.complete(work);