From 79df7974ba3e25b58c56e5302f78b285c93a99c3 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 23 Aug 2023 16:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusArrearsCarryVehicleApplyService.java   | 70 +++++++++++++++++--
 .../BusDeliveredApplyMapper.java              |  1 +
 .../BusDeliveredApplyMapper.xml               | 13 ++++
 .../BusDeliveredApplyService.java             | 12 ++--
 .../BusDeliveredApplyDetailsService.java      |  4 +-
 5 files changed, 90 insertions(+), 10 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
index a695d2a279..3498bc215d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
@@ -2280,6 +2280,36 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
                 busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
+                ResultBean<List<LatestTaskVo>> listResultBeans = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
+                String nextNodeUserSids = listResultBeans.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBeans.getData().get(0).getName_();
+                if ("发起申请".equals(nextName)) {
+                    try {
+                        ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                                .setNameFormat("demo-pool-%d").build();
+                        ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                                0L, TimeUnit.MILLISECONDS,
+                                new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                        BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
@@ -2297,9 +2327,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         messageFlowableQuery.setAppMap(appMap);
                         messageFlowableQuery.setBusinessSid(query.getBusinessSid());
                         messageFlowableQuery.setModuleName("欠款提车申请");
-                        ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                       /* ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
-                        String nextName = listResultBean.getData().get(0).getName_();
+                        String nextName = listResultBean.getData().get(0).getName_();*/
                         if ("发起申请".equals(nextName)) {
                             messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                             baseVehicleTempstateFeign.delByBusSid(finalBusArrearsCarryVehicleApply.getSid());
@@ -2351,14 +2381,46 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg("操作失败!");
                 }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 String nextNodeUserSids = resultBean.getData().getNextNodeUserSids();
                 busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid());
-                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
+               /* ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
                 String nextName = listResultBean.getData().get(0).getName_();
                 if ("发起申请".equals(nextName)) {
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
                 }
-                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+*/
+                ResultBean<List<LatestTaskVo>> listResultBeans = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId());
+//                String nextNodeUserSids = listResultBeans.getData().get(0).getASSIGNEE_();
+                String nextName = listResultBeans.getData().get(0).getName_();
+                if ("发起申请".equals(nextName)) {
+                    baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
+                    try {
+                        ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                                .setNameFormat("demo-pool-%d").build();
+                        ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                                0L, TimeUnit.MILLISECONDS,
+                                new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                        BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
index 9dd0c5fd1a..2801e19d93 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
@@ -103,6 +103,7 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
     IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppDeliveredApplyPageQuery> qw, @Param("name") String name);
 
     List<String> selectVinNo(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
+    List<String> selectVinNosss(@Param("contractId") String contractId, @Param("list") List<String> vinSid);
 
     String selectNum(String billNo);
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
index dd9db2de69..853cb8a533 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
@@ -110,6 +110,19 @@
         </foreach>
     </select>
 
+    <select id="selectVinNosss" resultType="java.lang.String">
+        select RIGHT(bv.linkNo, 8)
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bo on bv.salesOrderSid = bo.sid
+        left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
+        where bo.contractNo = #{contractId}
+        and bs.busState != '401' and (bs.finState != '1' or bs.carryVehicleState != '1')
+        and bv.linkSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
     <select id="selectNum" resultType="java.lang.String">
         select RIGHT(billNo, 4)
         from bus_delivered_apply
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 a96f8b5187..9678bfcb0e 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
@@ -373,7 +373,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (busDeliveredApply == null) {
                 return rb.setMsg("该申请不存在");
             }
-            List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+            /*List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
             List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(dtoSid);
             vinSidList.removeAll(Collections.singleton(null));
             if (!vinSidList.isEmpty()) {
@@ -384,7 +384,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     stateDtoList.add(baseVehicleStateDto);
                 });
                 ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
-            }
+            }*/
             List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
             if (dtoList.size() > 0) {
                 busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
@@ -523,7 +523,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }*/
         if (sidsList.size() > 0) {
             for (int i = 0; i < sidsList.size(); i++) {
-                List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+                /*List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
                 List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sidsList.get(i));
                 vinSidList.removeAll(Collections.singleton(null));
                 if (!vinSidList.isEmpty()) {
@@ -534,7 +534,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         stateDtoList.add(baseVehicleStateDto);
                     });
                     ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
-                }
+                }*/
                 busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
                 busDeliveredUseMessageService.deleteByApplySid(sidsList.get(i));
                 busDeliveredDetailsDiscountService.deleteByApplySid(sidsList.get(i));
@@ -2430,6 +2430,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     return rb.setMsg(String.join(",", vinNoLists) + "已发起过出库流程");
                 }
             }
+            List<String> vinNoListss = baseMapper.selectVinNosss(dto.getContractId(), vinSid);
+            if (!vinNoListss.isEmpty()) {
+                return rb.setMsg(String.join(",", vinNoListss) + "不符合出库的条件");
+            }
             //判断是否存在优惠包超出的情况
             int giveNumBySid = 0;
             for (int i = 0; i < carList.size(); i++) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
index 39c57bd69d..29f12867dc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java
@@ -168,7 +168,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
             }
         }
 
-        List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+       /* List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
         List<String> vinSidList = selectVinSidByApplySid(sid);
         vinSidList.removeAll(Collections.singleton(null));
         if (!vinSidList.isEmpty()) {
@@ -179,7 +179,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
                 stateDtoList.add(baseVehicleStateDto);
             });
             ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
-        }
+        }*/
     }
 
     /**