定制金融流程

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -570,6 +570,8 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid());
                 busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey());
                 busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType());
+                busHandoverWaitDto.setCreateBySid(busHandoverPrepare.getCreateBySid());
+                busHandoverWaitDto.setOrgSidPath(busHandoverPrepare.getOrgSidPath());
                 busHandoverWaitService.saveAll(busHandoverWaitDto);
             }
         }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -51,6 +51,7 @@ public enum ProcDefEnum {
     LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
     LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:1:2847504"),
     DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"),
+    LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
 
     /******************************测试流程id*********************************************/
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java

@@ -41,6 +41,10 @@ public interface LoanSolutionsFeign {
     @PostMapping("/save")
     ResultBean save(@RequestBody SolutionsDto dto);
 
+    @ApiOperation("保存金融方案2")
+    @PostMapping("/save2")
+    ResultBean save2(@RequestBody SolutionsDto dto);
+
     @ApiOperation("根据销售订单sid查询金融方案")
     @GetMapping("/selectDetailss")
     ResultBean<SolutionsDetailsVo> selectDetailss(@RequestParam("businessSid") String businessSid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java

@@ -34,6 +34,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
         return null;
     }
 
+    @Override
+    public ResultBean save2(SolutionsDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<SolutionsDetailsVo> selectDetailss(String businessSid) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java

@@ -45,6 +45,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
         return loanSolutionsService.saveDto(dto);
     }
 
+    @Override
+    public ResultBean save2(SolutionsDto dto) {
+        return loanSolutionsService.save2(dto);
+    }
+
     @Override
     public ResultBean<SolutionsDetailsVo> selectDetailss(String businessSid) {
         return loanSolutionsService.selectDetailss(businessSid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -772,14 +772,14 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         loanSolutions.setTrailerAmount(dto.isTrailerAmountCb() ? new BigDecimal(dto.getTrailerAmount()) : BigDecimal.ZERO);
         //是否勾选保险
         loanSolutions.setPremiumCb(dto.isPremiumCb() ? 1 : 0);
-        if(StringUtils.isNotBlank(dto.getPremium())){
+        if (StringUtils.isNotBlank(dto.getPremium())) {
             loanSolutions.setPremium(new BigDecimal(dto.getPremium()));
         }
 //        loanSolutions.setPremium(StringUtils.isNotBlank(dto.getPremium()) ? new BigDecimal(dto.getPremium()) : BigDecimal.ZERO);
         //是否勾选购置税
         loanSolutions.setPurchaseTaxCb(dto.isPurchaseTaxCb() ? 1 : 0);
 //        loanSolutions.setPurchaseTax(StringUtils.isNotBlank(dto.getPurchaseTax()) ? new BigDecimal(dto.getPurchaseTax()) : BigDecimal.ZERO);
-        if(StringUtils.isNotBlank(dto.getPurchaseTax())){
+        if (StringUtils.isNotBlank(dto.getPurchaseTax())) {
             loanSolutions.setPurchaseTax(new BigDecimal(dto.getPurchaseTax()));
         }
         //项目融资总额
@@ -1378,6 +1378,14 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         return rate;
     }
 
+    public ResultBean save2(SolutionsDto dto) {
+        SolutionDetailsDto solutionDetailsDto = new SolutionDetailsDto();
+        BeanUtil.copyProperties(dto, solutionDetailsDto);
+        solutionDetailsDto.setBusSid(dto.getSaleOrderSid());
+        ResultBean resultBean = saveDtoss(solutionDetailsDto);
+        return resultBean;
+    }
+
   /*  @Autowired
     private LoanSolutionsTopService loanSolutionsTopService;
     @Autowired

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@@ -15,6 +15,7 @@ import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -268,7 +269,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
         bv.setFormVariables(variables);
         if (r == 1) {
             //ToDo:流程定义id
-            bv.setModelId("");
+            bv.setModelId(ProcDefEnum.LOANTEMPLATEAPPLY.getProDefId());
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());