Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -495,11 +495,33 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> formVariables = bv.getFormVariables();
         if (formVariables == null) {
-            map.put("isAdj", i);
-            bv.setFormVariables(map);
+            formVariables = new HashMap<>();
+            formVariables.put("isAdj", i);
+            String ydfOrgSid = "";
+            if("调入".equals(baseAccadjApply.getAccadjTypeValue())){
+                ydfOrgSid = baseAccadjApply.getCallOutOrgSid();
+            }else if("调出".equals(baseAccadjApply.getAccadjTypeValue())){
+                ydfOrgSid = baseAccadjApply.getCallInOrgSid();
+            }
+            SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(ydfOrgSid).getData();
+            String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
+            formVariables.put("ydfOrgPath",orgSidPathDRBM);
+            formVariables.put("service","公司间调账");
+
         } else {
             formVariables.put("isAdj", i);
-        }
+            String ydfOrgSid = "";
+            if("调入".equals(baseAccadjApply.getAccadjTypeValue())){
+                ydfOrgSid = baseAccadjApply.getCallOutOrgSid();
+            }else if("调出".equals(baseAccadjApply.getAccadjTypeValue())){
+                ydfOrgSid = baseAccadjApply.getCallInOrgSid();
+            }
+            SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(ydfOrgSid).getData();
+            String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
+            formVariables.put("ydfOrgPath",orgSidPathDRBM);
+            formVariables.put("service","公司间调账");
+        }
+        bv.setFormVariables(formVariables);
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -763,7 +785,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 //货主:FOwnerID  (必填项)
                 //fe.setFOwnerID("101");
                 //仓库:FStockID
-                fe.setFStockID(baseVehicle.getLocationCode());
+//                fe.setFStockID(baseVehicle.getLocationCode());
+                fe.setFStockID("ARZSCK");
                 /*ResultBean<ScmWarehouseVo> voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation());
                 if (voResultBean.getSuccess()) {
                     fe.setFStockID(voResultBean.getData().getGressionCode());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -759,6 +759,13 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             finPaymentrecordDto.setCost(String.valueOf(booad.getDeposit().intValue()));
             finPaymentrecordDto.setAccountsReceive(String.valueOf(booad.getDeposit().intValue()));
         }
+        //应付类别
+        finPaymentrecordDto.setDictTypeCode("payCostType");
+        if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {
+         finPaymentrecordDto.setDictKey("002");
+        } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
+            finPaymentrecordDto.setDictKey("005");
+        }
         //供应商编码
         String purchasingUnitSid = booad.getPurchasingUnitSid();
         BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(purchasingUnitSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -698,6 +698,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
                     finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.DJ_TYPE.getCode());
                     finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.DJ_TYPE.getRemarks());
+                    finPaymentrecordDto.setDictTypeCode("payCostType");
+                    finPaymentrecordDto.setDictKey("005");
                     finPaymentrecordDto.setPayRemark(busVehicleApply.getPayRemarks());
                     finPaymentrecordDto.setCreateBySid(busVehicleApply.getCreateBySid());
                     finPaymentrecordDto.setRemarks("排产订金");

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -866,7 +866,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             FinPaymentrecord finPaymentrecordOne = null;
             if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive()) < 0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();
-                BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid");
+                BeanUtil.copyProperties(finPaymentrecord, finPaymentrecordOne, "sid","payBank","payBankAccount","userSid","name","payDate","payFile");
                 finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive().subtract(new BigDecimal(dto.getCost())));
                 finPaymentrecordOne.setCost(finPaymentrecordOne.getAccountsReceive());
             }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -463,6 +463,18 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
                     nextUserSid = stringResultBean.getData();
                 }
             }
+        } else if("公司间调账".equals(service) && ("Activity_01xvwhd".equals(bv.getTaskDefKey()) || "Activity_040lvti".equals(bv.getTaskDefKey()))){
+            if (StringUtils.isBlank(nextUserSid)) {
+                bv.setOrgSidPath(ydfOrgPath);
+                ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
+                if (!stringResultBean.getSuccess()) {
+                    //下一环节用户为空的情况
+                    nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
+                    adminContains = true;
+                } else {
+                    nextUserSid = stringResultBean.getData();
+                }
+            }
         }else if (StringUtils.isBlank(nextUserSid)) {
             ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
             if (!stringResultBean.getSuccess()) {

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -944,6 +944,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
             //--2025-02-12添加开始
             List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
+            ASSIGNEE_List.removeAll(Collections.singleton(null));
             if(!ASSIGNEE_List.isEmpty()){
                 StringBuilder userName = new StringBuilder();
                 for (String assignee : ASSIGNEE_List) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyVo.java

@@ -84,8 +84,8 @@ public class LoanRestoreReportApplyVo implements Vo {
     @ApiModelProperty("交回方式value")
     private String restoreTypeValue;
     @ApiModelProperty("预交回日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date restoreDate;
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String restoreDate;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("流程实例的sid")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -382,6 +382,8 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
                 loanBeCollectionVehDetailsVo.setLockCarState("控制失败");
             } else if ("3".equals(lockCarState)) {
                 loanBeCollectionVehDetailsVo.setLockCarState("已解控");
+            }else if("4".equals(lockCarState)){
+                loanBeCollectionVehDetailsVo.setLockCarState("解控中");
             }
             List<LoanFile> loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType());
             List<LoanBeCollectionFileVo> loanBeCollectionFileVos1 = new ArrayList<>();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -738,6 +738,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                             finPaymentrecordDto.setCostTypeValue(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks());// 款项类别
                             finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());// 款项名称
                             finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());//款项名称
+                            finPaymentrecordDto.setDictTypeCode("payCostType");
+                            finPaymentrecordDto.setDictKey("002");
                             finPaymentrecordDto.setReceiveBank(outsourcingApplicationDetailsVo.getDepositBankName());
                             finPaymentrecordDto.setReceiveBankAccount(outsourcingApplicationDetailsVo.getBankAccount()); // 收款银行账号
                             finPaymentrecordDto.setReceiveCompany(outsourcingApplicationDetailsVo.getPurchasingUnitName());