状态添加部分

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -43,6 +43,10 @@ public class BaseVehicleStateEnum {
         YWJS_STATE_1("601", "业务完成"),
         YWJS_STATE_2("602", "业务终止"),
 
+
+        FIN_STATE_JQ("1", "交清"),
+        FIN_STATE_WJQ("0", "未交清"),
+
         ;
 
         private String stateKey;
@@ -65,6 +69,7 @@ public class BaseVehicleStateEnum {
         JC_PASS("4", "交车审核通过"),
         BUS_STOP("5", "业务终止"),
         DDBA_SAVEVIN("6", "录入车架号"),
+        FIN_RQ("7", "款项认款"),
 
         ;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -55,9 +55,12 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                 //销售订单录入车架号
                 baseVehicleState.setVinNo(dto.getVinNo());
                 baseVehicleState.setVinSid(dto.getVinSid());
+            } else if (BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey().equals(operateType)) {
+                //认款办理确认以及结转审核通过的更新款项状态为1  已交清，否则为0
+                baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
+
             }
 
-            //认款办理确认以及结转审核通过的更新款项状态为1，否则为0
 
             baseMapper.updateById(baseVehicleState);
         });

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -4825,23 +4825,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } catch (Exception e) {
                 e.printStackTrace();
             }
-           /* //==============================
-            //如果创建人与部门主管一样，则自动到下一环节。
-            if (busSalesOrder.get().getCreateBySid().equals(nextNodeUserSids_)) {
-                busSalesOrderOne = fetchBySid(businessSid);
-                bv = new BusinessVariables();
-                bv.setModelId(busSalesOrderOne.getProcDefId());
-                bv.setInstanceId(busSalesOrderOne.getProcInstId());
-                bv.setTaskId(busSalesOrderOne.getTaskId());
-                bv.setUserSid(busSalesOrderOne.getCreateBySid());
-                bv.setBusinessSid(busSalesOrderOne.getSid());
-                bv.setTaskDefKey(busSalesOrderOne.getNodeId());
-                Map<String, Object> variabless = getOrderMap(busSalesOrderOne);
-                bv.setFormVariables(variabless);
-                bv.setOrgSidPath(busSalesOrderOne.getOrgSidPath());
-                bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！");
-                return complete(bv);
-            }*/
             try {
                 ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                         .setNameFormat("demo-pool-%d").build();
@@ -5206,6 +5189,34 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //推送车款
                     createCarFin(vo, busSalesOrder);
                 }
+                //==============================修改车辆的持久状态组装数据
+                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());
+                    Future future1 = pool.submit(() -> {
+                        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                        List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
+                        vehicleList.removeAll(Collections.singleton(null));
+                        if (!vehicleList.isEmpty()) {
+                            vehicleList.stream().forEach(v -> {
+                                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey());
+                                if (StringUtils.isNotBlank(v.getLinkSid())) {
+                                    baseVehicleStateDto.setVinSid(v.getLinkSid());
+                                    baseVehicleStateDto.setVinNo(v.getLinkNo());
+                                }
+                                baseVehicleStateDto.setBusSid(v.getSid());
+                                dtoList.add(baseVehicleStateDto);
+                            });
+                            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 //-----------------推送车款款项结束
                 //推送采购渠道待选择
                 BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -1345,4 +1345,12 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         System.out.println(customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix);
         return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix;
     }
+
+
+    public void jzComplete(String sid){
+        FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(sid);
+        //查询结转的款项
+        List<FinFundsCarriedForwardVeh> finFundsCarriedForwardVehList = finFundsCarriedForwardVehService.selectByCollSid(sid);
+
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.java

@@ -79,4 +79,6 @@ public interface FinFundsCarriedForwardVehMapper extends BaseMapper<FinFundsCarr
     String selectByBusSid(List<String> sidsList);
 
 	List<FinCustNameAndPhone> fetchNameAndPhoneByBusSid(String busSid);
+
+	List<FinFundsCarriedForwardVeh> selectByCollSid(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehMapper.xml

@@ -62,4 +62,8 @@
                 ON fcc.`busSid` = bd.`billSid`
         WHERE ffv.`busSid` = #{busSid}
     </select>
+
+    <select id="selectByCollSid" resultType="com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh">
+        select * from fin_funds_carried_forward_veh where mainSid = #{sid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardveh/FinFundsCarriedForwardVehService.java

@@ -166,4 +166,8 @@ public class FinFundsCarriedForwardVehService extends MybatisBaseService<FinFund
 	public List<FinCustNameAndPhone> fetchNameAndPhoneByBusSid(String busSid) {
 		return baseMapper.fetchNameAndPhoneByBusSid(busSid);
 	}
+
+	public List<FinFundsCarriedForwardVeh> selectByCollSid(String sid) {
+		return baseMapper.selectByCollSid(sid);
+	}
 }