修改金融产品政策报备以及移动端流程代码

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java

@@ -1,4 +1,5 @@
 package com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply;
+
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -52,17 +53,17 @@ public interface LoanFinOtherPolicyRecordApplyFeign {
 
 
     /**
-     * 金融产品政策报备初始化
+     * 其他融产品报备初始化
      *
-     * @param dto
+     * @param sids
      */
     @ApiOperation("金融产品政策报备保存初始化")
-    @GetMapping("/policyRecordInit")
+    @PostMapping("/policyRecordInit")
     @ResponseBody
-    public ResultBean<LoanFinOtherPolicyApplyInitVo> policyRecordInit(@RequestBody LoanFinOtherPolicyApplyDto dto);
+    public ResultBean<LoanFinOtherPolicyApplyInitVo> policyRecordInit(@RequestBody String[] sids);
 
     /**
-     * 金融产品政策报备初始化
+     * 其他融产品报备初始化
      *
      * @param sid
      */
@@ -72,8 +73,18 @@ public interface LoanFinOtherPolicyRecordApplyFeign {
     public ResultBean<LoanFinOtherPolicyApplyInitVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
 
+    /**
+     * 批量删除（已测试）
+     *
+     * @param sids
+     */
+    @ApiOperation("批量删除")
+    @DeleteMapping("/deleteBySids")
+    @ResponseBody
+    public ResultBean deleteBySids(@RequestBody String[] sids);
+
     /******************流程接口**************************************/
-    @ApiOperation("金融政策产品备案提交")
+    @ApiOperation("其他融产品备案提交")
     @PostMapping("/submit")
     public ResultBean submitRecordApplication(@RequestBody @Valid SubmitLoanOtherPolicyApplyDto dto);
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeignFallback.java

@@ -30,7 +30,7 @@ public class LoanFinOtherPolicyRecordApplyFeignFallback implements LoanFinOtherP
     }
 
     @Override
-    public ResultBean<LoanFinOtherPolicyApplyInitVo> policyRecordInit(LoanFinOtherPolicyApplyDto dto) {
+    public ResultBean<LoanFinOtherPolicyApplyInitVo> policyRecordInit(String[] sids) {
         return null;
     }
 
@@ -39,6 +39,11 @@ public class LoanFinOtherPolicyRecordApplyFeignFallback implements LoanFinOtherP
         return null;
     }
 
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        return null;
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitLoanOtherPolicyApplyDto dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyApplyVo.java

@@ -40,5 +40,8 @@ public class LoanFinPolicyApplyVo implements Vo {
     private String nodeState;
     @ApiModelProperty("备注")
     private String remarks;
+    private String procDefId;
+    @ApiModelProperty("实例id")
+    private String procInstId;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyFeign.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -58,7 +59,7 @@ public interface LoanFinPolicyRecordApplyFeign {
      * @param
      */
     @ApiOperation("金融产品政策报备保存初始化")
-    @GetMapping("/policyRecordInit")
+    @PostMapping("/policyRecordInit")
     @ResponseBody
     public ResultBean<LoanFinPolicyApplyInitVo> policyRecordInit(@RequestBody String[] sids);
 
@@ -115,10 +116,10 @@ public interface LoanFinPolicyRecordApplyFeign {
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
-    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
-    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyApplyVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyRecordApply;
-import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyRecordApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.Map;
 
@@ -22,4 +22,7 @@ public interface LoanFinOtherPolicyRecordApplyMapper extends BaseMapper<LoanFinO
     IPage<LoanFinOtherPolicyApplyVo> selectPageVo(IPage<LoanFinOtherPolicyRecordApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanFinOtherPolicyRecordApply> qw);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    @Update("update loan_fin_other_policy_record_apply set isDelete = 1 where sid =#{sid}")
+    int updateBySidDelete(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java

@@ -48,9 +48,9 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco
     }
 
     @Override
-    public ResultBean<LoanFinOtherPolicyApplyInitVo> policyRecordInit(LoanFinOtherPolicyApplyDto dto) {
+    public ResultBean<LoanFinOtherPolicyApplyInitVo> policyRecordInit(String[] sids) {
         ResultBean<LoanFinOtherPolicyApplyInitVo> rb = ResultBean.fireFail();
-        LoanFinOtherPolicyApplyInitVo vo = loanFinOtherPolicyRecordApplyService.policyRecordInit(dto);
+        LoanFinOtherPolicyApplyInitVo vo = loanFinOtherPolicyRecordApplyService.policyRecordInit(sids);
         return rb.success().setData(vo);
     }
 
@@ -61,6 +61,18 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean deleteBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            int count = loanFinOtherPolicyRecordApplyService.updateBySidDelete(sid);
+            if (count == 0) {
+                return rb.setMsg("删除失败");
+            }
+        }
+        return ResultBean.fireSuccess().setMsg("删除成功");
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitLoanOtherPolicyApplyDto dto) {
         return loanFinOtherPolicyRecordApplyService.submitRecordApplication(dto);
@@ -76,8 +88,8 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco
 
     @Override
     public ResultBean companyToDivisionOperate(LoanOtherPolicyApplyCompleteDto query) {
-        BusinessVariables bv=new BusinessVariables();
+        BusinessVariables bv = new BusinessVariables();
-        BeanUtil.copyProperties(query,bv);
+        BeanUtil.copyProperties(query, bv);
         bv.setModelId(ProcDefEnum.LOANOTHERPOLICYRECORDAPPLY.getProDefId());
         return loanFinOtherPolicyRecordApplyService.companyToDivisionOperate(bv);
     }
@@ -94,21 +106,21 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco
 
     @Override
     public ResultBean breakProcess(LoanOtherPolicyApplyTaskQuery query) {
-        return null;
+        return loanFinOtherPolicyRecordApplyService.breakProcess(query);
     }
 
     @Override
     public ResultBean flowRecord(String procInsId) {
-        return null;
+        return loanFinOtherPolicyRecordApplyService.flowRecord(procInsId);
     }
 
     @Override
     public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
-        return null;
+        return loanFinOtherPolicyRecordApplyService.getNextNodesForSubmit(query);
     }
 
     @Override
     public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
-        return null;
+        return loanFinOtherPolicyRecordApplyService.getPreviousNodesForReject(query);
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java

@@ -21,14 +21,11 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.*;
+import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.GetNodeQuery;
+import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.GetNodeVo;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyTaskQuery;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.SubmitLoanOtherPolicyApplyDto;
-import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.LoanFinPolicyRecordApply;
-import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.*;
-import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.flow.GetNodeQuery;
-import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.flow.GetNodeVo;
-import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.flow.LoanFinPolicyApplyTaskQuery;
-import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.flow.SubmitLoanFinPolicyApplyDto;
 import com.yxt.anrui.riskcenter.biz.loanfinotherPolicy.LoanFinOtherPolicyService;
 import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -184,13 +181,12 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
         return p;
     }
 
-    public LoanFinOtherPolicyApplyInitVo policyRecordInit(LoanFinOtherPolicyApplyDto dto) {
+    public LoanFinOtherPolicyApplyInitVo policyRecordInit(String[] sids) {
         LoanFinOtherPolicyApplyInitVo vo = new LoanFinOtherPolicyApplyInitVo();
-        BeanUtil.copyProperties(dto, vo);
+        vo.setPolicySids(new ArrayList<>());
         vo.setApplyDate(new Date());
         List<LoanFinOtherPolicyApplyInitListVo> policyList = new ArrayList<>();
-        List<String> policySids = dto.getPolicySids();
+        for (String policySid : sids) {
-        for (String policySid : policySids) {
             LoanFinOtherPolicyApplyInitListVo initVo = new LoanFinOtherPolicyApplyInitListVo();
             LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(policySid);
             BeanUtil.copyProperties(loanFinOtherPolicy, initVo);
@@ -210,12 +206,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
             vo.setInstanceId(entity.getProcInstId());
         }
         String policySid = entity.getOtherPolicySid();
-        List<String> pSids = new ArrayList<>();
         String[] policySids = policySid.split(",");
-        for (String s : policySids) {
-            pSids.add(s);
-        }
-        vo.setPolicySids(pSids);
         List<LoanFinOtherPolicyApplyInitListVo> policyList = new ArrayList<>();
         for (String psid : policySids) {
             LoanFinOtherPolicyApplyInitListVo initVo = new LoanFinOtherPolicyApplyInitListVo();
@@ -550,7 +541,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
                     if (userVo != null) {
                         if (StringUtils.isNotBlank(userVo.getName())) {
                             messageFlowableQuery.setMsgContent(userVo.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                         }
+                        }
                     }
                 }
                 messageFlowableQuery.setMsgTitle("其他融产品备案");
@@ -560,4 +551,86 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
+
+    public ResultBean breakProcess(LoanOtherPolicyApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        if (StringUtils.isBlank(query.getComment())) {
+            return rb.setMsg("请填写意见");
+        }
+        LoanFinOtherPolicyRecordApply recordApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = recordApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (query.getUserSid().equals(recordApply.getCreateBySid())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(map);
+                return rb.success().setData(resultBean.getData());
+            } else {
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(map);
+                    return rb.success().setData(resultBean.getData());
+                }
+            }
+
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean flowRecord(String procInsId) {
+        return flowTaskFeign.businessFlowRecord(procInsId);
+    }
+
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        LoanFinOtherPolicyRecordApply recordApply = fetchBySid(query.getBusinessSid());
+        bv.setFormVariables(variables);
+        bv.setModelId(recordApply.getProcDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        LoanFinOtherPolicyRecordApply recordApply = fetchBySid(query.getBusinessSid());
+        bv.setFormVariables(variables);
+        bv.setModelId(recordApply.getProcDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public int updateBySidDelete(String sid) {
+        return baseMapper.updateBySidDelete(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyMapper.xml

@@ -26,7 +26,9 @@
         applicant,
         applyDate,
         nodeState,
-        remarks
+        remarks,
+        procDefId,
+        procInstId
         FROM loan_fin_policy_record_apply
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyRest.java

@@ -83,7 +83,7 @@ public class LoanFinPolicyRecordApplyRest implements LoanFinPolicyRecordApplyFei
 
     @Override
     public ResultBean companyToDivisionOperate(LoanFinPolicyApplyCompleteDto query) {
-        BusinessVariables bv=new BusinessVariables();
+        BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query,bv);
         bv.setModelId(ProcDefEnum.LOANFINPOLICYRECORDAPPLY.getProDefId());
         return loanFinPolicyRecordApplyService.companyToDivisionOperate(bv);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@@ -220,6 +220,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
         if (StringUtils.isNotBlank(entity.getProcInstId())) {
             vo.setInstanceId(entity.getProcInstId());
         }
+        vo.setUserSid(entity.getCreateBySid());
         String policySid = entity.getPolicySid();
         List<String> pSids = new ArrayList<>();
         String[] policySids = policySid.split(",");
@@ -410,13 +411,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             }
             int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-//                LoanFinPolicyApplyInitVo entity = fetchDetailsBySid(businessSid);
+                LoanFinPolicyRecordApply entity = fetchBySid(businessSid);
-//                List<String> policySids = entity.getPolicySids();
+                String policySid = entity.getPolicySid();
-//                for (String policySid : policySids) {
+                String[] policySids = policySid.split(",");
-//                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(policySid);
+                for (String pSid : policySids) {
-//                    loanFinPolicy.setFilingState(1);
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(pSid);
-//                    loanFinPolicyService.updateById(loanFinPolicy);
+                    loanFinPolicy.setFilingState(1);
-//                }
+                    loanFinPolicyService.updateById(loanFinPolicy);
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -646,9 +648,9 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             if (!resultBean1.getSuccess()) {
                 return rb.setMsg(resultBean1.getMsg());
             }
+            UpdateFlowFieldVo ufVo = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
             //极光推送
-            UpdateFlowFieldVo ufVo = resultBean1.getData();
             finPolicyRecordApply = fetchBySid(bv.getBusinessSid());
             SysUserVo userVo = sysUserFeign.fetchBySid(finPolicyRecordApply.getCreateBySid()).getData();
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
@@ -663,14 +665,6 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
             messageFlowableQuery.setMsgContent(userVo.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("金融产品政策备案");
             messageFeign.pushMessage(messageFlowableQuery);
-            //修改备案状态
-            LoanFinPolicyApplyInitVo entity = fetchDetailsBySid(bv.getBusinessSid());
-            List<String> policySids = entity.getPolicySids();
-            for (String policySid : policySids) {
-                LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(policySid);
-                loanFinPolicy.setFilingState(1);
-                loanFinPolicyService.updateById(loanFinPolicy);
-            }
             return rb.success().setData(resultBean1.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");

anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml

@@ -38,7 +38,18 @@ mybatis-plus:
     call-setters-on-nulls: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
+#hystrix的超时时间
-
+hystrix:
-
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 30000
+#ribbon的超时时间
+ribbon:
+  ReadTimeout: 30000
+  ConnectTimeout: 30000
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppFinPolicyApplyInitVo.java

@@ -27,6 +27,8 @@ public class AppFinPolicyApplyInitVo implements Vo {
     private String department;
     @ApiModelProperty("申请人")
     private String applicant;
+    @ApiModelProperty("某某部门，某某人")
+    private String publishInfo;
     @ApiModelProperty("申请日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date applyDate;
@@ -35,7 +37,7 @@ public class AppFinPolicyApplyInitVo implements Vo {
     @ApiModelProperty("实例id")
     @JsonProperty("procInsId")
     private String instanceId;
-//    @ApiModelProperty("申请金融产品政策sid")
+    //    @ApiModelProperty("申请金融产品政策sid")
 //    private List<String> policySids = new ArrayList<>();
     @ApiModelProperty("附件路径")
     private List<String> annexPaths = new ArrayList<>();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppPolicyApplyInitListVo.java

@@ -34,9 +34,9 @@ public class AppPolicyApplyInitListVo implements Vo {
     @ApiModelProperty("保险保证金")
     private String depositPremium;
     @ApiModelProperty("落户保证金")
-    private BigDecimal depositSettle;
+    private String depositSettle;
     @ApiModelProperty("名义/留购价款")
-    private BigDecimal nominalPrice;
+    private String nominalPrice;
     @ApiModelProperty("有效期至")
     private String validDateTo;
     @ApiModelProperty("是否有其他融政策")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/policyrecordapply/PolicyRecordApplyService.java

@@ -13,6 +13,7 @@ import com.yxt.anrui.terminal.api.risk.policyrecordapply.AppFinPolicyApplyInitVo
 import com.yxt.anrui.terminal.api.risk.policyrecordapply.flow.CompletePolicyDto;
 import com.yxt.anrui.terminal.api.risk.policyrecordapply.flow.PolicyFlowableQuery;
 import com.yxt.anrui.terminal.api.risk.policyrecordapply.flow.PolicyTaskQuery;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,9 @@ public class PolicyRecordApplyService {
         if (resultBean.getSuccess()) {
             LoanFinPolicyApplyInitVo data = resultBean.getData();
             BeanUtil.copyProperties(data, vo);
+            if (StringUtils.isNotBlank(vo.getApplicant()) && StringUtils.isNotBlank(vo.getDepartment())) {
+                vo.setPublishInfo(vo.getDepartment() + "-" + vo.getApplicant());
+            }
         }
         return rb.success().setData(vo);
     }