diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue index 5def751afc..45e51e3d14 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue @@ -66,7 +66,7 @@
单台开票金额
- {{ formobj.oneBillMoney }} + {{ formobj.oneBillMoney }}价值客户
开票类型默认
@@ -303,6 +303,7 @@ export default { saleDeptSid: '', saleTypeKey: '', saleTypeValue: '', + showValueCustomer: false, sid: '', staffName: '', staffSid: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue index 01e2ed3290..3a521c9238 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue @@ -66,7 +66,7 @@
单台开票金额
- {{ formobj.oneBillMoney }} + {{ formobj.oneBillMoney }}价值客户
开票类型默认
@@ -303,6 +303,7 @@ export default { saleDeptSid: '', saleTypeKey: '', saleTypeValue: '', + showValueCustomer: false, sid: '', staffName: '', staffSid: '', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue index ec4afd16fa..2e2dace721 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue @@ -64,7 +64,7 @@
单台开票金额
- {{ formobj.oneBillMoney }} + {{ formobj.oneBillMoney }}价值客户
开票类型默认
@@ -274,6 +274,7 @@ export default { saleDeptSid: '', saleTypeKey: '', saleTypeValue: '', + showValueCustomer: false, sid: '', staffName: '', staffSid: '', diff --git a/anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue b/anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue deleted file mode 100644 index e47d3a9c87..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/FaImages.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue b/anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue deleted file mode 100644 index 80349528e6..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/FileUpload.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue b/anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue deleted file mode 100644 index 30011b8875..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/ImageUpload.vue +++ /dev/null @@ -1,132 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue b/anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue deleted file mode 100644 index 7ef250bbe7..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/ImageUploadChe.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue b/anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue deleted file mode 100644 index 5060ec457a..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/ManyImageUpload.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/index.vue b/anrui-riskcenter-ui/src/components/uploadFile/index.vue deleted file mode 100644 index 1b2b36b3c4..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/index.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/anrui-riskcenter-ui/src/components/uploadFile/upload.vue b/anrui-riskcenter-ui/src/components/uploadFile/upload.vue deleted file mode 100644 index d4418a8200..0000000000 --- a/anrui-riskcenter-ui/src/components/uploadFile/upload.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java index 4447c7f01d..4903812c72 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeign.java +++ b/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 policyRecordInit(@RequestBody LoanFinOtherPolicyApplyDto dto); + public ResultBean policyRecordInit(@RequestBody String[] sids); /** - * 金融产品政策报备初始化 + * 其他融产品报备初始化 * * @param sid */ @@ -72,8 +73,18 @@ public interface LoanFinOtherPolicyRecordApplyFeign { public ResultBean 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); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeignFallback.java index 1a248854bf..d75e617f8c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyFeignFallback.java +++ b/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 policyRecordInit(LoanFinOtherPolicyApplyDto dto) { + public ResultBean 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; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java index e7d05ef51a..f2282470cd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java @@ -25,6 +25,7 @@ public class AppPolicyDetailsVo implements Vo { private String busTypeValue; @ApiModelProperty("车辆大类") private String vehCategoryValue; + private String vehTypeValue; @ApiModelProperty("是否打包") private String isPack; @ApiModelProperty("是否担保") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyApplyVo.java index d7274e8282..2077ef15a4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyApplyVo.java +++ b/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; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyFeign.java index 930100a797..da0056b120 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyFeign.java +++ b/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 policyRecordInit(@RequestBody String[] sids); @@ -115,10 +116,10 @@ public interface LoanFinPolicyRecordApplyFeign { @ApiOperation(value = "获取下一个环节") @GetMapping(value = "/getNextNodesForSubmit") - ResultBean> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query); + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); @ApiOperation(value = "获取上一个环节") @GetMapping(value = "/getPreviousNodesForReject") - ResultBean> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query); + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java index c874f0b1dd..da64cd4844 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyMapper.java +++ b/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 selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); int updateFlowFiled(Map map); + + @Update("update loan_fin_other_policy_record_apply set isDelete = 1 where sid =#{sid}") + int updateBySidDelete(String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java index 5eb7a7e5e6..bdd3622815 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherpolicyrecordapply; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApply; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.*; @@ -48,9 +49,9 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco } @Override - public ResultBean policyRecordInit(LoanFinOtherPolicyApplyDto dto) { + public ResultBean policyRecordInit(String[] sids) { ResultBean rb = ResultBean.fireFail(); - LoanFinOtherPolicyApplyInitVo vo = loanFinOtherPolicyRecordApplyService.policyRecordInit(dto); + LoanFinOtherPolicyApplyInitVo vo = loanFinOtherPolicyRecordApplyService.policyRecordInit(sids); return rb.success().setData(vo); } @@ -61,6 +62,24 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco return rb.success().setData(vo); } + @Override + public ResultBean deleteBySids(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + LoanFinOtherPolicyRecordApply recordApply = loanFinOtherPolicyRecordApplyService.fetchBySid(sid); + if (null != recordApply) { + if (!recordApply.getNodeState().equals("待提交")) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } + } + 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 +95,8 @@ public class LoanFinOtherPolicyRecordApplyRest implements LoanFinOtherPolicyReco @Override public ResultBean companyToDivisionOperate(LoanOtherPolicyApplyCompleteDto query) { - BusinessVariables bv=new BusinessVariables(); - BeanUtil.copyProperties(query,bv); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); bv.setModelId(ProcDefEnum.LOANOTHERPOLICYRECORDAPPLY.getProDefId()); return loanFinOtherPolicyRecordApplyService.companyToDivisionOperate(bv); } @@ -94,21 +113,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> getNextNodesForSubmit(GetNodeQuery query) { - return null; + return loanFinOtherPolicyRecordApplyService.getNextNodesForSubmit(query); } @Override public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return null; + return loanFinOtherPolicyRecordApplyService.getPreviousNodesForReject(query); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java index 7b7b62d90d..86ae7a34dc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java +++ b/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.*; -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.api.loanfinpolicyrecordapply.LoanFinPolicyRecordApply; 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()); vo.setApplyDate(new Date()); List policyList = new ArrayList<>(); - List policySids = dto.getPolicySids(); - for (String policySid : policySids) { + for (String policySid : sids) { LoanFinOtherPolicyApplyInitListVo initVo = new LoanFinOtherPolicyApplyInitListVo(); LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(policySid); BeanUtil.copyProperties(loanFinOtherPolicy, initVo); @@ -210,12 +206,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService pSids = new ArrayList<>(); String[] policySids = policySid.split(","); - for (String s : policySids) { - pSids.add(s); - } - vo.setPolicySids(pSids); List policyList = new ArrayList<>(); for (String psid : policySids) { LoanFinOtherPolicyApplyInitListVo initVo = new LoanFinOtherPolicyApplyInitListVo(); @@ -550,7 +541,7 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map 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 resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map 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> getNextNodesForSubmit(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //根据业务sid查询排产信息 + LoanFinOtherPolicyRecordApply recordApply = fetchBySid(query.getBusinessSid()); + bv.setFormVariables(variables); + bv.setModelId(recordApply.getProcDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List 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> getPreviousNodesForReject(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //根据业务sid查询排产信息 + LoanFinOtherPolicyRecordApply recordApply = fetchBySid(query.getBusinessSid()); + bv.setFormVariables(variables); + bv.setModelId(recordApply.getProcDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List 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); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml index 6b3e9ff656..d6baa75885 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml @@ -80,7 +80,9 @@ lfp.depositSettle, lfp.nominalPrice, lfp.validDateTo, - lfp.isOtherProduct + lfp.isOtherProduct, + lfp.vehTypeValue, + lfp.bondRatio from loan_fin_policy lfp where lfp.sid = #{sid} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java index 920ffd322c..63097ce37e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java @@ -76,6 +76,36 @@ public class LoanFinPolicyService extends MybatisBaseService ${ew.sqlSegment} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyRest.java index 6d3253eca7..b0ee1c6cfa 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyRest.java @@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loanfinpolicyrecordapply; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyRecordApply; import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.*; import com.yxt.anrui.riskcenter.api.loanfinpolicyrecordapply.flow.*; import com.yxt.common.core.query.PagerQuery; @@ -59,6 +60,12 @@ public class LoanFinPolicyRecordApplyRest implements LoanFinPolicyRecordApplyFei ResultBean rb = ResultBean.fireFail(); // int count = baseFinBankService.deleteBySids(sidList); for (String sid : sids) { + LoanFinPolicyRecordApply recordApply = loanFinPolicyRecordApplyService.fetchBySid(sid); + if (null != recordApply) { + if (!recordApply.getNodeState().equals("待提交")) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } + } int count = loanFinPolicyRecordApplyService.updateBySidDelete(sid); if (count == 0) { return rb.setMsg("删除失败"); @@ -83,7 +90,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); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java index 43165b3dbb..6a9383b286 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java +++ b/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 pSids = new ArrayList<>(); String[] policySids = policySid.split(","); @@ -410,13 +411,14 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService policySids = entity.getPolicySids(); -// for (String policySid : policySids) { -// LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(policySid); -// loanFinPolicy.setFilingState(1); -// loanFinPolicyService.updateById(loanFinPolicy); -// } + LoanFinPolicyRecordApply entity = fetchBySid(businessSid); + String policySid = entity.getPolicySid(); + String[] policySids = policySid.split(","); + for (String pSid : policySids) { + LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(pSid); + loanFinPolicy.setFilingState(1); + loanFinPolicyService.updateById(loanFinPolicy); + } } return rb.success().setData(resultBean.getData()); } else { @@ -646,9 +648,9 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService 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("操作失败!提交的数据不一致"); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml index 037701b698..d96af68264 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application.yml +++ b/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 diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java index f4e15c5ade..af0a7d2572 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialOtherPolicyVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.financialPolicy; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +15,7 @@ public class FinancialOtherPolicyVo implements Vo { private static final long serialVersionUID = 3695189220403491871L; @ApiModelProperty("产品类别") + @JsonProperty("productTypeKey") private String productTypeValue; @ApiModelProperty("最高融资额比例（%）") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java index 3915c91547..9287990769 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.financialPolicy; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,15 +15,22 @@ public class FinancialPolicyDetailsVo implements Vo { private static final long serialVersionUID = -439513352576615253L; @ApiModelProperty("政策名称") + @JsonProperty("policyName") private String policyName; @ApiModelProperty("适用部门，黑龙江销售部或分公司") + @JsonProperty("useDept") private String useDeptNames; @ApiModelProperty("资方简称") + @JsonProperty("bankName") private String bankShortName; @ApiModelProperty("业务类型") + @JsonProperty("busTypeValue") private String busTypeValue; @ApiModelProperty("车辆大类") + @JsonProperty("vehCategoryValue") private String vehCategoryValue; + @JsonProperty("vehTypeValue") + private String vehTypeValue; @ApiModelProperty("是否打包") private String isPack; @ApiModelProperty("是否担保") @@ -31,28 +39,40 @@ public class FinancialPolicyDetailsVo implements Vo { private String remarks; @ApiModelProperty("单车意外险") + @JsonProperty("vehAccidentAmount") private String vehAccidentAmount; @ApiModelProperty("最低首付比例") + @JsonProperty("minDownPaymentRatio") private String downPayRatioLeast; @ApiModelProperty("首付比例") + @JsonProperty("downPayRatio") private String downPayRatio; @ApiModelProperty("保证金比例") + @JsonProperty("bondRatio") private String bondRatio; @ApiModelProperty("期数") + @JsonProperty("period") private String period; @ApiModelProperty("标准年利率") + @JsonProperty("yearRatio") private String yearRatio; @ApiModelProperty("服务费类型") + @JsonProperty("serviceAmountType") private String serviceAmountTypeValue; @ApiModelProperty("服务费") + @JsonProperty("serviceAmount") private String serviceAmount; @ApiModelProperty("保险保证金") + @JsonProperty("depositPremium") private String depositPremium; @ApiModelProperty("落户保证金") + @JsonProperty("depositSettle") private String depositSettle; @ApiModelProperty("名义/留购价款") + @JsonProperty("nominalPrice") private String nominalPrice; @ApiModelProperty("有效期至") + @JsonProperty("validDateTo") private String validDateTo; @ApiModelProperty("其他融") private FinancialOtherPolicyVo otherInfo; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java index e5da6fdd4b..30d88086b7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyFeign.java @@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +29,7 @@ public interface FinancialPolicyFeign { ResultBean> getProductList(@RequestBody PagerQuery pagerQuery); @ApiOperation("app金融产品资方常规详情") - @PostMapping("getProductInfo") + @GetMapping("getProductInfo") ResultBean getProductInfo(@RequestParam("sid") String sid); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppFinPolicyApplyInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppFinPolicyApplyInitVo.java index ed4767599c..a4974488b5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppFinPolicyApplyInitVo.java +++ b/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 policySids = new ArrayList<>(); @ApiModelProperty("附件路径") private List annexPaths = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppPolicyApplyInitListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppPolicyApplyInitListVo.java index 195d431c04..b84f6e6044 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/policyrecordapply/AppPolicyApplyInitListVo.java +++ b/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("是否有其他融政策") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/policyrecordapply/PolicyRecordApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/policyrecordapply/PolicyRecordApplyService.java index e9498ea3e6..5440d89614 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/policyrecordapply/PolicyRecordApplyService.java +++ b/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); }