From 7f6a6f67455b475b187f6315bd22be3af3ad733c Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 6 Feb 2025 15:02:15 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=AC=E7=B4=AF?=
 =?UTF-8?q?=E6=AC=A0=E6=8E=A8=E9=80=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentPlanDetailsMapper.java       |  2 ++
 .../LoanRepaymentPlanDetailsMapper.xml        |  4 +++
 .../LoanRepaymentPlanDetailsService.java      |  4 +++
 .../ScheduledRepaymentPlanDetailsService.java | 27 ++++++++++++-------
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
index 99a80694ba..3de1615f0f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
@@ -101,4 +101,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     List<AppRepaymentPlanRecord> selByMainSidAndVinNo(@Param("scheduleSid") String scheduleSid, @Param("vinNo") String vinNo);
 
     void updatePaymentMoneyBySids(@Param("planSids") List<String> planSids);
+
+    int updateDataTime(@Param("format") String format);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index 3c00e3c4b3..d8610299f3 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -603,6 +603,10 @@
             #{planSid}
         </foreach>
     </update>
+    <update id="updateDataTime">
+        update loan_repayment_plan_details
+        set updateTime =#{format}
+    </update>
 
 
     <select id="selVehSidAndPeriod"
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
index 4cb07332a3..315b6d35e4 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
@@ -368,4 +368,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public void updatePaymentMoneyBySids(List<String> sids) {
         baseMapper.updatePaymentMoneyBySids(sids);
     }
+
+    public int updateDataTime(String format) {
+        return baseMapper.updateDataTime(format);
+    }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
index 1c96488d42..b47ee73d2d 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
@@ -1,9 +1,6 @@
 package com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.math.Money;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
@@ -12,21 +9,16 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay;
-import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
 import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
-import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils.CollectorsUtil;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.HistoryOverDueVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
-import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
-import com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayService;
 import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.core.result.ResultBean;
@@ -39,7 +31,6 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @description:
@@ -74,6 +65,8 @@ public class ScheduledRepaymentPlanDetailsService {
     @Scheduled(cron = "0 0 2 1 * ?")
     public void pushLateVoucher() {
         Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        int t = loanRepaymentPlanDetailsService.updateDataTime(sdf.format(date)); //修改数据更新日期
         Calendar calendar = Calendar.getInstance();//new一个Calendar类,把Date放进去
         calendar.setTime(date);
         calendar.add(Calendar.DATE, -1);
@@ -82,6 +75,20 @@ public class ScheduledRepaymentPlanDetailsService {
         useOrgSidList.removeAll(Collections.singleton(null));
         if (!useOrgSidList.isEmpty()) {
             for (String u : useOrgSidList) {
+                //判断当期是否逾期
+                List<HistoryOverDueVo> overDueVoList = loanRepaymentPlanDetailsService.overDueVoList(u);
+                if (!overDueVoList.isEmpty()) {
+                    List<String> planSids = new ArrayList<>();
+                    overDueVoList.stream().forEach(v -> {
+                        if (v.getOverdueState().equals("0")) {
+                            planSids.add(v.getPlanSid());
+                        }
+                    });
+                    if (!planSids.isEmpty()) {
+                        int i = loanRepaymentPlanDetailsService.updateOverDueState(planSids);
+                    }
+                }
+                //查询是否符合转累欠
                 List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(u);
                 List<String> planSids = new ArrayList<>();
                 if (!records.isEmpty()) {

From 2762541ebe0064ee620ff8f36f4be9879ff1c73e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 6 Feb 2025 15:40:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E7=BA=B3?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chunafukuan/chunafukuanguanli/cashier.vue | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
index 4d16f852eb..c35adf14e6 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
@@ -480,16 +480,12 @@ export default {
       this.getList()
     },
     changePayBankAccount(value) {
-      let bb = null
-      this.payBankAccount_list.forEach((e) => {
-        if (e.bankAccount === value) {
-          bb = {
-            name: e.accountName,
-            value: e.bankAccount
-          }
-        }
-      })
-      this.formobj.payBank = bb.name
+      const choose = this.payBankAccount_list.filter((item) => item.bankAccount === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.payBank = choose[0].accountName
+      } else {
+        this.formobj.payBank = ''
+      }
     },
     handleSelectionChange(row) {
       console.log('aaa', row)
@@ -573,16 +569,27 @@ export default {
     },
     changerRceiveCompany(value) {
       const choose = this.receiveCompany_list.filter((item) => item.name === value)
-      this.formobj.payCode = choose[0].payCode
-      getBankList({ sid: choose[0].sid }).then((res) => {
-        if (res.success) {
-          this.receiveBankAccount_list = res.data
-        }
-      })
+      if (choose !== null && choose.length > 0) {
+        this.formobj.payCode = choose[0].payCode
+        getBankList({ sid: choose[0].sid }).then((res) => {
+          if (res.success) {
+            this.receiveBankAccount_list = res.data
+          }
+        })
+      } else {
+        this.formobj.payCode = ''
+        this.formobj.receiveBankAccount = ''
+        this.formobj.receiveBank = ''
+        this.receiveBankAccount_list = []
+      }
     },
     changeReceiveBankAccount(value) {
       const choose = this.receiveBankAccount_list.filter((item) => item.receiveBankAccount === value)
-      this.formobj.receiveBank = choose[0].receiveBank
+      if (choose !== null && choose.length > 0) {
+        this.formobj.receiveBank = choose[0].receiveBank
+      } else {
+        this.formobj.receiveBank = ''
+      }
     },
     handleGetCheck(row) {
       this.dialogImgVisible = true
@@ -649,7 +656,7 @@ export default {
       this.formobj.receiveCompany = row.receiveCompany
       this.formobj.receiveBankAccount = row.receiveBankAccount
       this.formobj.receiveBank = row.receiveBank
-      this.formobj.payCode = row.payCode
+      this.changerRceiveCompany(this.formobj.receiveCompany)
       this.formobj.payWayValue = row.payWayValue
       this.changePayWay(row.payWayValue)
       const aa = []

From ee399ccee68181058425e7f07278ad4d47c3c66b Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 6 Feb 2025 16:50:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=9D=9E=E6=8B=85=E4=BF=9D=E7=9A=84?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java             | 212 +++++++++---------
 1 file changed, 109 insertions(+), 103 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 0c9bc5ad48..85184ee4a3 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -300,6 +300,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
+
     /**
      * 构造出库申请的查询条件
      *
@@ -859,7 +860,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param bv
      * @return
      */
-    public ResultBean   complete(BusinessVariables bv) {
+    public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(bv.getBusinessSid());
         bv.setOrgSidPath(busDeliveredApply.getOrgSidPath());
@@ -1190,7 +1191,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                             if (solutionsDetailsVo != null) {
                                 //三方金融的，在出库时推送单车返利数据，金额为厂家贴息。
-                                if("2".equals(busSalesOrder.getFinancePlan())){
+                                if ("2".equals(busSalesOrder.getFinancePlan())) {
                                     Future future11 = pool.submit(() -> {
                                         pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
                                     });
@@ -1361,7 +1362,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
     }
 
-    private void pushVehRebateAdjustBill(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList,SolutionsDetailsVo solutionsDetailsVo) {
+    private void pushVehRebateAdjustBill(BusDeliveredApply busDeliveredApply, List<BusDeliveredApplyDetails> detailsList, SolutionsDetailsVo solutionsDetailsVo) {
         BigDecimal cjtx = BigDecimal.ZERO;//厂家贴息
         BigDecimal txdck = BigDecimal.ZERO;//贴息抵车款
         if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
@@ -1424,7 +1425,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             scmVehRebateDto.setRebateTypeValue("金融贴息");
             scmVehRebateDto.setRebateName("金融贴息");
             scmVehRebateDto.setCalculationStandard(factoryDiscount);
-            scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(),"yyyy-MM"));
+            scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM"));
             scmVehRebateDto.setCalculationModeKey("002");
             scmVehRebateDto.setCalculationModeValue("固定金额");
             scmVehRebateDto.setOrgPath(busDeliveredApply.getOrgSidPath());
@@ -1679,7 +1680,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                             if (solutionsDetailsVo != null) {
                                 //三方金融的，在出库时推送单车返利数据，金额为厂家贴息。
-                                if("2".equals(busSalesOrder.getFinancePlan())){
+                                if ("2".equals(busSalesOrder.getFinancePlan())) {
                                     Future future11 = pool.submit(() -> {
                                         pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
                                     });
@@ -3433,79 +3434,82 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             return rb.setMsg("请选择要出库的车辆");
         }
         if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
-            //先查询该订单下是否有挂车，如果有的话，再根据该订单及车辆查询挂车是否都已入库，若没有全部入库，则提示
-            boolean isHave = false;
-            List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
-            trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-            // 如果列表不为空，使用流式操作计算总挂车数量
-            if(!trailersLists.isEmpty()){
-                int totalTrailerCount = trailersLists.stream()
-                        .mapToInt(BusSalesOrderTrailer::getTrailerCount)  // 提取数量
-                        .sum();  // 累加所有数量
+            if ("01".equals(busSalesOrder.getFinancePlan())) {
+                //先查询该订单下是否有挂车，如果有的话，再根据该订单及车辆查询挂车是否都已入库，若没有全部入库，则提示
+                boolean isHave = false;
+                List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
+                trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                // 如果列表不为空，使用流式操作计算总挂车数量
+                if (!trailersLists.isEmpty()) {
+                    int totalTrailerCount = trailersLists.stream()
+                            .mapToInt(BusSalesOrderTrailer::getTrailerCount)  // 提取数量
+                            .sum();  // 累加所有数量
 
-                if(!carList.isEmpty()){
-                    for (AppCarListVo car : carList) {
-                        //根据车辆sid 查询挂车的数量
-                        List<BaseTrailer> trList = baseMapper.selectTralier(car.getVinSid());
-                        trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-                        if(totalTrailerCount != trList.size()){
-                            isHave = true;
-                            break;
+                    if (!carList.isEmpty()) {
+                        for (AppCarListVo car : carList) {
+                            //根据车辆sid 查询挂车的数量
+                            List<BaseTrailer> trList = baseMapper.selectTralier(car.getVinSid());
+                            trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                            if (totalTrailerCount != trList.size()) {
+                                isHave = true;
+                                break;
+                            }
                         }
                     }
                 }
-            }
-            if(isHave){
-                LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(),dto.getLoanSid());
-                if("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())){//是公司采购
-                    return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请");
+                if (isHave) {
+                    LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(), dto.getLoanSid());
+                    if ("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())) {//是公司采购
+                        return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请");
+                    }
                 }
-            }
-            boolean issHave = false;
-            List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo2(dto.getContractId());
-            makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-            if(!makeUpsList.isEmpty()){
-                //查询上装入库中是否有该主车关联的上装
-                if(!carList.isEmpty()){
-                    for (AppCarListVo car : carList) {
-                        //根据车辆sid和合同号查询主车车架号
-                        BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId());
-                        List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
-                        trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-                        if(trList.isEmpty()){
-                            issHave = true;
-                            break;
+                boolean issHave = false;
+                List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo2(dto.getContractId());
+                makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                if (!makeUpsList.isEmpty()) {
+                    //查询上装入库中是否有该主车关联的上装
+                    if (!carList.isEmpty()) {
+                        for (AppCarListVo car : carList) {
+                            //根据车辆sid和合同号查询主车车架号
+                            BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(), dto.getContractId());
+                            List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
+                            trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                            if (trList.isEmpty()) {
+                                issHave = true;
+                                break;
+                            }
                         }
                     }
                 }
-            }
-            if(issHave){
-                LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(),dto.getLoanSid());
-                if("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())){//是公司采购
-                    return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
-                }
+                if (issHave) {
+                    LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(), dto.getLoanSid());
+                    if ("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())) {//是公司采购
+                        return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
+                    }
 
+                }
             }
-        }else{
+
+        } else {
             boolean issHave = false;
             List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId());
             makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-            if(!makeUpsList.isEmpty()){
+            if (!makeUpsList.isEmpty()) {
                 //查询上装入库中是否有该主车关联的上装
-                if(!carList.isEmpty()){
+                if (!carList.isEmpty()) {
                     for (AppCarListVo car : carList) {
                         //根据车辆sid和合同号查询主车车架号
-                        BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId());
+                        BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(), dto.getContractId());
                         List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
                         trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-                        if(trList.isEmpty()){
+                        if (trList.isEmpty()) {
                             issHave = true;
                             break;
                         }
                     }
                 }
             }
-            if(issHave){
+            if (issHave) {
                 return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
             }
         }
@@ -4424,79 +4428,81 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         //=====================
         if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
-            //先查询该订单下是否有挂车，如果有的话，再根据该订单及车辆查询挂车是否都已入库，若没有全部入库，则提示
-            boolean isHave = false;
-            List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
-            trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-            // 如果列表不为空，使用流式操作计算总挂车数量
-            if(!trailersLists.isEmpty()){
-                int totalTrailerCount = trailersLists.stream()
-                        .mapToInt(BusSalesOrderTrailer::getTrailerCount)  // 提取数量
-                        .sum();  // 累加所有数量
+            if ("01".equals(busSalesOrder.getFinancePlan())) {
+                //先查询该订单下是否有挂车，如果有的话，再根据该订单及车辆查询挂车是否都已入库，若没有全部入库，则提示
+                boolean isHave = false;
+                List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
+                trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                // 如果列表不为空，使用流式操作计算总挂车数量
+                if (!trailersLists.isEmpty()) {
+                    int totalTrailerCount = trailersLists.stream()
+                            .mapToInt(BusSalesOrderTrailer::getTrailerCount)  // 提取数量
+                            .sum();  // 累加所有数量
 
-                if(!carList.isEmpty()){
-                    for (AppCarListVo car : carList) {
-                        //根据车辆sid 查询挂车的数量
-                        List<BaseTrailer> trList = baseMapper.selectTralier(car.getVinSid());
-                        trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-                        if(totalTrailerCount != trList.size()){
-                            isHave = true;
-                            break;
+                    if (!carList.isEmpty()) {
+                        for (AppCarListVo car : carList) {
+                            //根据车辆sid 查询挂车的数量
+                            List<BaseTrailer> trList = baseMapper.selectTralier(car.getVinSid());
+                            trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                            if (totalTrailerCount != trList.size()) {
+                                isHave = true;
+                                break;
+                            }
                         }
                     }
                 }
-            }
-            if(isHave){
-                LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(),dto.getLoanSid());
-                if("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())){//是公司采购
-                    return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请");
+                if (isHave) {
+                    LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(), dto.getLoanSid());
+                    if ("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())) {//是公司采购
+                        return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请");
+                    }
                 }
-            }
-            boolean issHave = false;
-            List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo2(dto.getContractId());
-            makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-            if(!makeUpsList.isEmpty()){
-                //查询上装入库中是否有该主车关联的上装
-                if(!carList.isEmpty()){
-                    for (AppCarListVo car : carList) {
-                        //根据车辆sid和合同号查询主车车架号
-                        BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId());
-                        List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
-                        trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-                        if(trList.isEmpty()){
-                            issHave = true;
-                            break;
+                boolean issHave = false;
+                List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo2(dto.getContractId());
+                makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                if (!makeUpsList.isEmpty()) {
+                    //查询上装入库中是否有该主车关联的上装
+                    if (!carList.isEmpty()) {
+                        for (AppCarListVo car : carList) {
+                            //根据车辆sid和合同号查询主车车架号
+                            BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(), dto.getContractId());
+                            List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
+                            trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                            if (trList.isEmpty()) {
+                                issHave = true;
+                                break;
+                            }
                         }
                     }
                 }
-            }
-            if(issHave){
-                LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(),dto.getLoanSid());
-                if("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())){//是公司采购
-                    return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
-                }
+                if (issHave) {
+                    LoanHomevisitInvestigateCustomer loanHomevisitInvestigateCustomer = baseMapper.getHomeVisitCustomerInfo(busSalesOrder.getSid(), dto.getLoanSid());
+                    if ("0".equals(loanHomevisitInvestigateCustomer.getIsCompBuy())) {//是公司采购
+                        return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
+                    }
 
+                }
             }
-        }else{
+        } else {
             boolean issHave = false;
             List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId());
             makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-            if(!makeUpsList.isEmpty()){
+            if (!makeUpsList.isEmpty()) {
                 //查询上装入库中是否有该主车关联的上装
-                if(!carList.isEmpty()){
+                if (!carList.isEmpty()) {
                     for (AppCarListVo car : carList) {
                         //根据车辆sid和合同号查询主车车架号
-                        BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId());
+                        BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(), dto.getContractId());
                         List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
                         trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
-                        if(trList.isEmpty()){
+                        if (trList.isEmpty()) {
                             issHave = true;
                             break;
                         }
                     }
                 }
             }
-            if(issHave){
+            if (issHave) {
                 return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
             }
         }

From cf4729236ff375d9d73bee81c83d8464a73c27df Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 6 Feb 2025 16:54:58 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=9A=E7=AD=BE?=
 =?UTF-8?q?=E5=92=8C=E6=88=96=E7=AD=BE=E7=9A=84=E5=9B=BA=E5=AE=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/biz/flow3/Flow3Rest.java   |  46 ++++
 .../flowable/biz/flow3/Flow3Service.java      | 255 ++++++++++++++++++
 2 files changed, 301 insertions(+)
 create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java
 create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java
new file mode 100644
index 0000000000..c8bc34eac1
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Rest.java
@@ -0,0 +1,46 @@
+package com.yxt.anrui.flowable.biz.flow3;
+
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/24
+ **/
+@RestController
+@RequestMapping("v3/flow")
+public class Flow3Rest {
+
+    @Autowired
+    private Flow3Service flowService;
+
+    public ResultBean<UpdateFlowFieldVo> startProcess2(BusinessVariables bv) {
+        ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
+        //获取表单中的参数
+        Map<String, Object> formVariables = bv.getFormVariables();
+        formVariables = formVariables == null ? new HashMap<>() : formVariables;
+        //发起人的组织全路径
+        String orgPath = bv.getOrgSidPath();
+        formVariables.put("createrOrgPath", orgPath);
+        formVariables.put("businessSid", bv.getBusinessSid());
+        //启动流程实例
+        ResultBean<UpdateFlowFieldVo> startResultBean = flowService.businessStartProcessInstanceById2(bv);
+        return startResultBean;
+    }
+
+    @PostMapping("/submit2")
+    public ResultBean submit222() {
+        return flowService.submit222();
+    }
+
+
+}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java
new file mode 100644
index 0000000000..ed1a3e33a5
--- /dev/null
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java
@@ -0,0 +1,255 @@
+package com.yxt.anrui.flowable.biz.flow3;
+
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
+import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService;
+import com.yxt.anrui.flowable.biz.process.ProcessService;
+import com.yxt.anrui.flowable.biz.processcomment.ProcessCommentService;
+import com.yxt.anrui.flowable.common.ProcessConstants;
+import com.yxt.anrui.flowable.feign.MessageFeign;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign;
+import com.yxt.anrui.portal.api.sysflowcc.SysFlowccFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.common.core.result.ResultBean;
+import org.flowable.engine.*;
+import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
+import org.flowable.engine.repository.Deployment;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.identitylink.service.IdentityLinkService;
+import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/1/24
+ **/
+@Service
+public class Flow3Service {
+
+    @Autowired
+    RepositoryService repositoryService;
+    @Autowired
+    RuntimeService runtimeService;
+
+    @Autowired
+    ManagementService managementService;
+    @Autowired
+    ProcessEngineConfigurationImpl processEngineConfiguration;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    @Autowired
+    protected IdentityService identityService;
+    @Autowired
+    protected TaskService taskService;
+    @Autowired
+    private SysFlowableConfigFeign sysFlowableConfigFeign;
+    @Autowired
+    private FlowTaskService flowTaskService;
+    @Autowired
+    private ProcessCommentService processCommentService;
+
+    @Autowired
+    protected HistoryService historyService;
+
+    @Autowired
+    private ProcessService processService;
+
+    @Autowired
+    private MessageFeign messageFeign;
+    @Autowired
+    private SysFlowccFeign sysFlowccFeign;
+
+
+    /**
+     * 启动流程
+     *
+     * @param bv
+     * @return
+     */
+    public ResultBean<UpdateFlowFieldVo> businessStartProcessInstanceById2(BusinessVariables bv) {
+        ResultBean<UpdateFlowFieldVo> rb = ResultBean.fireFail();
+        UpdateFlowFieldVo updateFlowFieldVo = new UpdateFlowFieldVo();
+        String procDefId = bv.getModelId();
+        String userSid = bv.getUserSid();
+        String nextNodeUserSids = bv.getNextNodeUserSids();
+        Map<String, Object> variables = bv.getFormVariables();
+        Map<String, Object> variablesSeconds = bv.getFormVariables();
+        //根据流程定义id查询
+        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId)
+                .latestVersion().singleResult();
+        if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
+            return rb.setMsg("流程已被挂起,请先激活流程");
+        }
+        // 设置流程发起人Id到流程中
+        ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(userSid);
+        SysUserVo sysUser = sysUserVoResultBean.getData();
+        identityService.setAuthenticatedUserId(sysUser.getSid());
+        variables.put(ProcessConstants.PROCESS_INITIATOR, userSid);
+        variables.put(ProcessConstants.USER_TYPE_ASSIGNEE, userSid);
+        ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDefId, variables);
+        // 给第一步申请人节点设置任务执行人和意见 todo:第一个节点不设置为申请人节点有点问题？
+        Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
+        if (Objects.nonNull(task)) {
+            taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.START.getType(),
+                    sysUser.getName() + "发起流程申请");
+            taskService.setAssignee(task.getId(), userSid);
+            taskService.complete(task.getId(), variables);
+        }
+        List<String> aggigneeList = (List<String>) variables.get("approvers");
+        // 获取多实例任务的所有实例
+        List<Task> tasks = taskService.createTaskQuery()
+                .processInstanceId(processInstance.getProcessInstanceId())  // 使用流程实例ID进行过滤
+                .taskDefinitionKey("Activity_1f8o20w")  // 指定多实例任务的定义Key
+                .list();  // 查询所有相关的任务实例
+        // 确保查询到了多条任务实例
+        if (!tasks.isEmpty()) {
+            // 遍历任务列表并为每个任务设置执行人
+            for (int i = 0; i < tasks.size(); i++) {
+                Task taskss = tasks.get(i);
+                // 确保任务和用户数量匹配，避免索引越界
+                if (i < aggigneeList.size()) {
+                    String assignee = aggigneeList.get(i);  // 获取用户
+                    taskService.setAssignee(taskss.getId(), assignee);  // 为任务设置执行人
+                }
+            }
+        }
+        return rb.success().setData(updateFlowFieldVo).setMsg("流程启动成功");
+    }
+
+
+    public ResultBean submit222() {
+        String userSid = "7f56f6ec-4a5f-47b0-aaab-158d64cb97b1";
+        // 或签任务候选人
+        List<String> userIds = new ArrayList<>();
+        userIds.add("dc6b9e36-1b31-4b94-908b-d2d7f78a0977");
+        userIds.add("657bf5a5-7665-440e-9cbd-ab87eccfbdcc");
+        userIds.add("2737e5ee-5ffd-4127-919b-e6694dfc8361");
+
+        // 会签任务候选人
+        List<String> approvers = new ArrayList<>();
+        approvers.add("1d85d1fe-e527-4ec5-a5e4-c37a76a36518");
+        approvers.add("64e289bc-80cd-487a-9498-5ae61e260f71");
+        approvers.add("7ffcd76a-4fa0-4c9c-87ca-a0c2116bb2ed");
+
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("userSids", userIds);
+        variables.put("approvers", approvers);
+        variables.put(ProcessConstants.PROCESS_INITIATOR, userSid);
+        variables.put(ProcessConstants.USER_TYPE_ASSIGNEE, userSid);
+        // 设置流程发起人Id到流程中
+        ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(userSid);
+        SysUserVo sysUser = sysUserVoResultBean.getData();
+        identityService.setAuthenticatedUserId(sysUser.getSid());
+        // 启动流程实例
+        ProcessInstance processInstance = runtimeService.startProcessInstanceById("process_rrqxpsu8:5:16907561", variables);
+
+        // 断言流程实例是否成功启动
+        assertNotNull(processInstance);
+        System.out.println("流程实例ID: " + processInstance.getId());
+
+        // 查询用户任务
+        List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+        // 模拟申请人完成任务
+        for (int i = 0; i < tasks.size(); i++) {
+            Task task = tasks.get(i);
+            taskService.complete(task.getId(), variables);
+        }
+
+        tasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+        assertEquals(approvers.size(), tasks.size());
+
+        // 验证每个任务是否正确分配给指定的用户
+        for (Task task : tasks) {
+            System.out.println("用户任务ID: " + task.getId());
+            System.out.println("任务名称: " + task.getName());
+            System.out.println("任务分配给的执行人员: " + task.getAssignee());
+            // 添加候选人
+            for (String approver : approvers) {
+                taskService.addCandidateUser(task.getId(), approver); // 将候选人添加到任务
+            }
+
+            // 验证任务分配给的执行人员（此时任务没有assignee）
+            assertNull(task.getAssignee());  // 确保没有直接分配执行人员
+            // 验证任务分配给的执行人员
+//            assertTrue(approvers.contains(task.getAssignee()));
+        }
+        //为候选人分配 任务
+        for (int i = 0; i < tasks.size(); i++) {
+            Task task = tasks.get(i);
+            taskService.claim(task.getId(), approvers.get(i));  // 由候选人认领任务
+        }
+
+        // 模拟两个用户完成任务
+        for (int i = 0; i < 2; i++) {
+            Task task = tasks.get(i);
+            taskService.complete(task.getId());
+        }
+
+        // 检查流程实例是否仍然处于活动状态
+        boolean isEnded = runtimeService.createProcessInstanceQuery()
+                .processInstanceId(processInstance.getId())
+                .singleResult() == null;
+        assertFalse(isEnded);
+
+        // 处理最后一个人
+        Task lastTask = tasks.get(tasks.size() - 1);
+        taskService.complete(lastTask.getId());
+
+
+        //======================================================================================
+        //===或签任务
+       List<Task> approvalTasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+        //为候选人分配 任务
+        for (int i = 0; i < approvalTasks.size(); i++) {
+            Task task = approvalTasks.get(i);
+            taskService.claim(task.getId(), userIds.get(0));  // 由候选人认领任务
+        }
+       // 模拟只有一个人完成任务
+        approvalTasks = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+        Task approvalTask = approvalTasks.get(0);
+
+        taskService.complete(approvalTask.getId());
+       /* // 手动更新历史记录中的 `ASSIGNEE_` 和 `END_TIME_`
+        HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
+                .taskId(approvalTask.getId()).singleResult();
+        if (historicTask != null) {
+            // 只有在实际完成的用户任务记录中才更新这些字段
+            System.out.println("Task completed by: " + historicTask.getAssignee());
+            System.out.println("Task end time: " + historicTask.getEndTime());
+        }*/
+        HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
+                .taskId(approvalTask.getId())
+                .singleResult();
+        if (historicTask != null && historicTask.getEndTime() != null) {
+            System.out.println("Task completed by: " + historicTask.getAssignee());
+            System.out.println("Task end time: " + historicTask.getEndTime());
+        }
+
+        //======================================================================================
+        //===总经理审批
+        List<Task> approvalTasks2 = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
+        Task approvalTask2 = approvalTasks2.get(0);
+        taskService.claim(approvalTask2.getId(), "503efb39-7889-4185-807f-624271a951aa");
+        taskService.complete(approvalTask2.getId());
+        // 检查流程实例是否已经结束
+        boolean isEnded2 = runtimeService.createProcessInstanceQuery()
+                .processInstanceId(processInstance.getId())
+                .singleResult() == null;
+        assertTrue(isEnded2);
+
+        return ResultBean.fireSuccess();
+    }
+
+}

From 35aad376f72a36683d4c898c89694b78f7ad8776 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 6 Feb 2025 16:59:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=9A=E7=AD=BE?=
 =?UTF-8?q?=E5=92=8C=E6=88=96=E7=AD=BE=E7=9A=84=E5=9B=BA=E5=AE=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/flowable/biz/flow3/Flow3Service.java    | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java
index ed1a3e33a5..ad90ddb006 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow3/Flow3Service.java
@@ -221,20 +221,15 @@ public class Flow3Service {
         Task approvalTask = approvalTasks.get(0);
 
         taskService.complete(approvalTask.getId());
-       /* // 手动更新历史记录中的 `ASSIGNEE_` 和 `END_TIME_`
+
+        //==待定
+        // 手动更新历史记录中的 `ASSIGNEE_` 和 `END_TIME_`
         HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
                 .taskId(approvalTask.getId()).singleResult();
         if (historicTask != null) {
             // 只有在实际完成的用户任务记录中才更新这些字段
             System.out.println("Task completed by: " + historicTask.getAssignee());
             System.out.println("Task end time: " + historicTask.getEndTime());
-        }*/
-        HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
-                .taskId(approvalTask.getId())
-                .singleResult();
-        if (historicTask != null && historicTask.getEndTime() != null) {
-            System.out.println("Task completed by: " + historicTask.getAssignee());
-            System.out.println("Task end time: " + historicTask.getEndTime());
         }
 
         //======================================================================================