Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -3252,7 +3252,25 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
+                UpdateFlowFieldVo ufVo = resultBean.getData();
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(ufVo.getProcInsId());
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                if ("发起申请".equals(ufVo.getNodeState())) {
+                    //查询销售订单信息
+                    BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
+                    List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                    List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByOrderSidAndVehSid(busSalesOrder.getSid(), finBillVehicleVo.getVehSid()).getData();
+                        baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey());
+                        baseVehicleStateDtos.add(baseVehicleStateDto);
+                    }
+                    baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
+                }
                 return rb.success().setData(resultBean.getData());
             }
         }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -866,6 +866,36 @@ public class AppBusAdvanceGinvoiceapplyService {
         submitAdvanceInvoiceDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         submitAdvanceInvoiceDto.setZjApplicationAppendxs(idCardImagesPC);
         submitAdvanceInvoiceDto.setArrearsCollectionAppendxs(qklpfjImages);
+        List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy();
+        List<FinBillFileDto> gsgdhdwdbjys = new ArrayList<>();
+        if (gsgdhdwdbjy != null) {
+            for (String gs : gsgdhdwdbjy) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(gs);
+                gsgdhdwdbjys.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setPcgsgdhdwdbjy(gsgdhdwdbjys);
+        List<String> zrrdbcns = dto.getZrrdbcns();
+        List<FinBillFileDto> zrrdbcnss = new ArrayList<>();
+        if (zrrdbcns != null) {
+            for (String zr : zrrdbcns) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(zr);
+                zrrdbcnss.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setPczrrdbcns(zrrdbcnss);
+        List<String> zfxsjt = dto.getZfxsjt();
+        List<FinBillFileDto> zfxsjts = new ArrayList<>();
+        if (zfxsjt != null) {
+            for (String zr : zfxsjt) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(zr);
+                zfxsjts.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setPczfxsjt(zfxsjts);
         ResultBean resultBean = finBillApplicationFeign.submitFinBillApplicationQK(submitAdvanceInvoiceDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -1378,6 +1408,36 @@ public class AppBusAdvanceGinvoiceapplyService {
             }
         }
         submitAdvanceInvoiceDto.setFjApplicationAppendxs(fj);
+        List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy();
+        List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>();
+        if (gsgdhdwdbjy != null) {
+            for (String gs : gsgdhdwdbjy) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(gs);
+                pcgsgdhdwdbjy.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy);
+        List<String> zrrdbcns = dto.getZrrdbcns();
+        List<FinBillFileDto> pczrrdbcns = new ArrayList<>();
+        if (zrrdbcns != null) {
+            for (String gs : zrrdbcns) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(gs);
+                pczrrdbcns.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setPczrrdbcns(pczrrdbcns);
+        List<FinBillFileDto> pczfxsjt = new ArrayList<>();
+        List<String> zfxsjt = dto.getZfxsjt();
+        if (zfxsjt != null) {
+            for (String gs : zfxsjt) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(gs);
+                pczfxsjt.add(finBillFileDto);
+            }
+        }
+        submitAdvanceInvoiceDto.setPczfxsjt(pczfxsjt);
         ResultBean resultBean = finBillApplicationFeign.submitFinBillApplicationQKLP(submitAdvanceInvoiceDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());