diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java index 686e0363d6..d33ce9a4e8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java +++ b/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 variables = new HashMap<>(); + Map 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 resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -1044,6 +1060,15 @@ public class BaseDistributorApplyService extends MybatisBaseService 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 resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java index 75be8dfb0b..0221c5c46b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java +++ b/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 baseVehicleStateDtos = new ArrayList<>(); + baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos); List finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid); if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开 @@ -2259,7 +2261,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid); List 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 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(); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index e7cd2afe3a..8e5cc57c45 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/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 loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos); + loanHomeVisitInvestigateInitCustomerVo.setSid(sid); return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo); } @@ -632,6 +634,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService