Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java

@@ -753,6 +753,22 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
         BaseDistributorApply baseDistributorApply = this.fetchBySid(businessSid);
         if (bv.getTaskId().equals(baseDistributorApply.getTaskId())) {
             bv.setOrgSidPath(baseDistributorApply.getOrgSidPath());
+            //流程中的参数赋值
+            Map<String, Object> variables = new HashMap<>();
+            Map<String, Object> appMap = new HashMap<>();
+            //若有网关，则赋值网关中判断的字段。
+            boolean isDecide = true;
+            //去查询是否同意
+            if (StringUtils.isNotBlank(baseDistributorApply.getAgree())) {
+                if (baseDistributorApply.getAgree().equals("0")) {
+                    isDecide = false;
+                }
+            }
+            variables.put("isDecide", isDecide);
+            variables.put("businessSid", businessSid);
+            appMap.put("sid", businessSid);
+            variables.put("app", appMap);
+            bv.setFormVariables(variables);
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -1044,6 +1060,15 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", businessSid);
                 variables.put("app", appMap);
+                //若有网关，则赋值网关中判断的字段。
+                boolean isDecide = true;
+                //去查询是否同意
+                if (StringUtils.isNotBlank(baseDistributorApply.getAgree())) {
+                    if (baseDistributorApply.getAgree().equals("0")) {
+                        isDecide = false;
+                    }
+                }
+                variables.put("isDecide", isDecide);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -80,6 +80,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.SubmitLoanCreditApplyDto;
@@ -453,6 +454,11 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
                         finUncollectedReceivablesDetailedDto.setKxState("01");
                         finUncollectedReceivablesDetailedDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
                         finUncollectedReceivablesDetailedDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
+                        finUncollectedReceivablesDetailedDto.setStaffName(busSalesOrder.getStaffName());
+                        SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+                        finUncollectedReceivablesDetailedDto.setStaffUserSid(sysUserVo.getSid());
+                        finUncollectedReceivablesDetailedDto.setStaffDeptSid(busSalesOrder.getOrgSid());
+                        finUncollectedReceivablesDetailedDto.setStaffDeptName(busSalesOrder.getOrgName());
                         finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
                     }
                 } else {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java

@@ -89,4 +89,13 @@ public class FinUncollectedReceivablesDetailedDto implements Dto {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员部门")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
 }

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

@@ -758,6 +758,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
                 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
                 if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
@@ -2259,7 +2261,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
                 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
-                if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
+                /*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
                     BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
                     busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
                     busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName());
@@ -2295,7 +2297,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     busValcustFilingDto.setBusSid(finBillApplication.getSid());
                     busValcustFilingDto.setBusSource("0");
                     busValcustFilingFeign.save(busValcustFilingDto);
-                } else {//不是高低开
+                } else {*///不是高低开
                     for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
                         int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
                         if (count == 0) {
@@ -2384,7 +2386,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             }
                         }
                     }
-                }
+                //}
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
                 if (oneBillMoney == null) {
                     busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -196,7 +196,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
             String createBySid = query.getCreateBySid();
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
         }
-        qw.eq("furd.useOrgSid",useOrgSid);
+        qw.eq("furd.useOrgSid", useOrgSid);
         qw.eq("furd.createBySid", query.getCreateBySid());
         String[] sids = query.getSids();
         if (sids != null) {
@@ -243,7 +243,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         String sid = dto.getSid();
         FinUncollectedReceivablesDetailed entity = new FinUncollectedReceivablesDetailed();
         if (StringUtils.isBlank(sid)) {//新增
-            BeanUtils.copyProperties(dto, entity);
+            BeanUtils.copyProperties(dto, entity, "sid");
             entity.setCurrentReceivableMoney(BigDecimal.ZERO);
             save(entity);
             return rb.success().setMsg("添加成功");
@@ -989,8 +989,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         List<String> busVinSid = stateQuery.getBusVinSid();
         String kxState = stateQuery.getKxState();
         busVinSid.removeAll(Collections.singleton(null));
-        if(!busVinSid.isEmpty()){
-            baseMapper.updateKxState(busVinSid,kxState);
+        if (!busVinSid.isEmpty()) {
+            baseMapper.updateKxState(busVinSid, kxState);
         }
         return rb.success();
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -527,6 +527,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName());
             loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
             loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
+            loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
             return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
         }
         //银行卡附件
@@ -541,6 +542,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         //其他人员
         List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
         loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos);
+        loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
     }
 
@@ -632,6 +634,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
             loanHomeVisitInvestigateInitOrderVos.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
         }
+        loanHomeVisitInvestigateInitOrderVos.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitOrderVos);
     }
 
@@ -664,6 +667,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (loanHomeVisitInvestigateInitOperVo == null) {
             loanHomeVisitInvestigateInitOperVo = new LoanHomeVisitInvestigateInitOperVo();
         }
+        loanHomeVisitInvestigateInitOperVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitOperVo);
     }
 
@@ -692,6 +696,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (loanHomeVisitInvestigateInitTranVo == null) {
             loanHomeVisitInvestigateInitTranVo = new LoanHomeVisitInvestigateInitTranVo();
         }
+        loanHomeVisitInvestigateInitTranVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitTranVo);
     }
 
@@ -729,6 +734,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         if (loanHomeVisitInvestigateInitPropVo == null) {
             loanHomeVisitInvestigateInitPropVo = new LoanHomeVisitInvestigateInitPropVo();
         }
+        loanHomeVisitInvestigateInitPropVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitPropVo);
     }
 
@@ -822,6 +828,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         loanHomeVisitInvestigateInitJFJZVo.setGroupPhoto(groupPhoto);
+        loanHomeVisitInvestigateInitJFJZVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitJFJZVo);
     }
 
@@ -980,6 +987,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
+        loanHomeVisitInvestigateInitZMWJVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo);
     }
 
@@ -1126,6 +1134,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             }
         }
         loanHomeVisitInvestigateInitZCLVo.setCarProperty(carProperty);
+        loanHomeVisitInvestigateInitZCLVo.setSid(sid);
         return rb.success().setData(loanHomeVisitInvestigateInitZCLVo);
     }