diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index 7232fb438e..d82acb7366 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -160,4 +160,6 @@ public class BaseOutsourcingApplication extends BaseEntity { @ApiModelProperty("申请人组织路径") private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("销售订单sid") + private String saleOrderSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index 227bbf9ab9..ef7dee3eeb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -189,4 +189,6 @@ public class BaseOutsourcingApplicationDto implements Dto { private String orgSidPath; // 申请人组织路径 @ApiModelProperty("申请人组织路径") private String orgPath; // 申请人组织路径 + @ApiModelProperty("销售订单sid") + private String saleOrderSid; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java index 02da2ae89c..448e9d8ac4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java @@ -31,6 +31,11 @@ public class BaseVehmodelVo implements Vo { @ApiModelProperty(value = "品牌sid") private String brandSid; + @ApiModelProperty(value = "品牌名称") + private String brandName; + + @ApiModelProperty(value = "内部编码") + private String insideCode; @ApiModelProperty(value = "配置") private String configName; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 5333c1c563..4fb39437f8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -224,9 +224,11 @@ bm.modelName, bmc.otherConfig, bm.carBrand as brandSid, + bm.brandName, bmc.configName, bvc.manufactorSettlementPrice, - bvc.modifyTime + bvc.modifyTime, + bvc.insideCode from base_vehmodel_config bvc left join base_vehicle_model bm on bvc.modelSid = bm.sid left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java index 787d0213bb..7af60a9662 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java @@ -107,8 +107,8 @@ public class SalOutStockService extends FinKingDeeService { int id = (int)result.get("Id"); ResultBean submit = submit(KingDeeBillId.SAL_OUTSTOCK.getID(),id+""); if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); - /*ResultBean audit = audit(data,KingDeeBillId.SAL_OUTSTOCK.getID()); - if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData());*/ + ResultBean audit = audit(data,KingDeeBillId.SAL_OUTSTOCK.getID()); + if (!audit.getSuccess()) return rb.setCode(KingDeeCode.AUDIT.getCode()).setData(audit.getData()); return stringResultBean; } catch (Exception e) { e.printStackTrace(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/flowable/LoanCreditApplyCompleteDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/flowable/LoanCreditApplyCompleteDto.java index c8eb8ebd87..d71a8c0aa3 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/flowable/LoanCreditApplyCompleteDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/flowable/LoanCreditApplyCompleteDto.java @@ -17,8 +17,6 @@ public class LoanCreditApplyCompleteDto implements Dto { @ApiModelProperty(value = "用户sid") private String userSid; - @ApiModelProperty(value = "下载类型") - private String pdfType; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; @@ -34,4 +32,6 @@ public class LoanCreditApplyCompleteDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误：businessSid") private String businessSid; + + private String orgPath; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index baf94ba280..1ece50337d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -165,6 +165,13 @@ public class LoanCreditAppealApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + for (LoanCreditAppealApplyVo record : pagging.getRecords()) { + record.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName()); + if ("待提交".equals(record.getNodeState())) { + record.setShowDeleteBtn(true); + record.setShowUpdateBtn(true); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -352,6 +366,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 appMap.put("sid", businessSid); + appMap.put("creditType", 2); variables.put("app", appMap); //流程定义id bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId()); @@ -421,11 +436,12 @@ public class LoanCreditAppealApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("creditType", 2); variables.put("app", appMap); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); - if (StringUtils.isBlank(loanCreditAppealApply.getProcDefId())){ + if (StringUtils.isBlank(loanCreditAppealApply.getProcDefId())) { flowProcessMapQuery.setProDefKey(bv.getModelId()); - }else { + } else { flowProcessMapQuery.setProDefKey(loanCreditAppealApply.getProcDefId()); } flowProcessMapQuery.setVariables(variables); @@ -441,7 +457,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); + appMap.put("creditType", 2); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -581,7 +598,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -590,9 +607,9 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - baseMapper.updateSsjgBySid("不通过",loanCreditAppealApply.getCreditApplySid()); + baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); - }else{ + } else { if (businessTaskId.equals(query.getTaskId())) { FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(query, flowTaskVo); @@ -602,7 +619,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - baseMapper.updateSsjgBySid("不通过",loanCreditAppealApply.getCreditApplySid()); + baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid()); return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java index 862752cf04..1c2a7dd0b1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java @@ -41,7 +41,12 @@ public class ScmPurchaseChannelDto implements Dto { @ApiModelProperty("用户sid") private String userSid; - + @ApiModelProperty("采购渠道key") + private String purchaseOrderTypeKey; + @ApiModelProperty("采购渠道value") + private String purchaseOrderTypeValue; + @ApiModelProperty("组织全路径") + private String orgSidPath; /* @ApiModelProperty("创建人接口") private String createByName; @@ -77,9 +82,4 @@ public class ScmPurchaseChannelDto implements Dto { private String useOrgSid; @ApiModelProperty("分公司名称") private String useOrgName;*/ - @ApiModelProperty("采购渠道key") - private String purchaseOrderTypeKey; - @ApiModelProperty("采购渠道value") - private String purchaseOrderTypeValue; - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java index c469817003..603d21ce06 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java @@ -74,4 +74,10 @@ public interface ScmPurchaseChannelFeign { @ResponseBody public ResultBean push(@RequestBody ScmPurchaseChannelPush dto); + @ApiOperation("推送外采申请") + @PostMapping("/sendOutApply") + @ResponseBody + public ResultBean sendOutApply(@RequestBody SendOutApplyDto dto); + + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java index 4e5b693df9..9e21da7902 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java @@ -66,4 +66,9 @@ public class ScmPurchaseChannelFeignFallback implements ScmPurchaseChannelFeign public ResultBean push(ScmPurchaseChannelPush dto) { return null; } + + @Override + public ResultBean sendOutApply(SendOutApplyDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/SendOutApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/SendOutApplyDto.java new file mode 100644 index 0000000000..e39209e13f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/SendOutApplyDto.java @@ -0,0 +1,43 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmpurchasechannel; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +@Data +public class SendOutApplyDto implements Dto { + + private String sid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgSidPath; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java index df49b95522..2b08237232 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java @@ -87,4 +87,9 @@ public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign { public ResultBean push(ScmPurchaseChannelPush dto) { return scmPurchaseChannelService.push(dto); } + + @Override + public ResultBean sendOutApply(SendOutApplyDto dto) { + return scmPurchaseChannelService.sendOutApply(dto); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java index 3e0834bacc..b1a8c4bfcb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java @@ -26,8 +26,26 @@ package com.yxt.anrui.scm.biz.scmpurchasechannel; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; +import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto; +import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; +import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.scmpurchasechannel.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -35,12 +53,31 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; @Service public class ScmPurchaseChannelService extends MybatisBaseService { + + @Autowired + private BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private BaseVehmodelConfigFeign baseVehmodelConfigFeign; + @Autowired + private BasePurchaseSystemFeign basePurchaseSystemFeign; + private QueryWrapper createQueryWrapper(ScmPurchaseChannelQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -118,6 +155,13 @@ public class ScmPurchaseChannelService extends MybatisBaseService guarantorList; @ApiModelProperty("资产附件") private List uploadFiles; + private String taskId; + private String procInsId; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java index 7b29bb6787..d6f8ad04ce 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java @@ -1,13 +1,11 @@ package com.yxt.anrui.terminal.api.risk.creditreview; -import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoQuery; -import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo; -import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageQuery; -import com.yxt.anrui.terminal.api.risk.policyrecordapply.AppFinPolicyApplyInitVo; -import com.yxt.common.core.query.PagerQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CompleteCreditDto; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditTaskQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.SubmitCreditDto; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -88,4 +86,36 @@ public interface CreditReviewFeign { @PostMapping("/saveCreditReviewInfo3") @ResponseBody public ResultBean saveCreditReviewInfo3(@RequestBody CreditReviewSsDto dto); + + /****************************************流程审批******************************************/ + + @ApiOperation("提交流程") + @PostMapping("/submitCreditInfo") + @ResponseBody + ResultBean submitCreditInfo(@RequestBody SubmitCreditDto dto); + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody CompleteCreditDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody CreditTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody CreditTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody CreditTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap CreditQuery query); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java index 99e3ed9b4c..a990356c2b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java @@ -1,5 +1,9 @@ package com.yxt.anrui.terminal.api.risk.creditreview; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CompleteCreditDto; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditTaskQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.SubmitCreditDto; 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; @@ -74,6 +78,36 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { return null; } + @Override + public ResultBean submitCreditInfo(SubmitCreditDto dto) { + return null; + } + + @Override + public ResultBean agreeCreditInfo(CompleteCreditDto dto) { + return null; + } + + @Override + public ResultBean rejectCreditInfo(CreditTaskQuery query) { + return null; + } + + @Override + public ResultBean recallCreditInfo(CreditTaskQuery query) { + return null; + } + + @Override + public ResultBean stopCreditInfo(CreditTaskQuery query) { + return null; + } + + @Override + public ResultBean getFlowOperateTitle(CreditQuery query) { + return null; + } + @Override public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewSsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewSsDto.java index e97c524d20..721a7521ce 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewSsDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewSsDto.java @@ -9,6 +9,8 @@ import java.util.List; @Data public class CreditReviewSsDto extends CreditReviewOffDto{ + @ApiModelProperty("贷前信用审核sid") + private String sid2; @ApiModelProperty("申诉原因") private String reason; @ApiModelProperty("申诉其他人员") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CompleteCreditDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CompleteCreditDto.java new file mode 100644 index 0000000000..fd57652d52 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CompleteCreditDto.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.terminal.api.risk.creditreview.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class CompleteCreditDto implements Dto { + private static final long serialVersionUID = 7978653524636034916L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CreditQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CreditQuery.java new file mode 100644 index 0000000000..6d111d0272 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CreditQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.terminal.api.risk.creditreview.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CreditQuery implements Query { + private static final long serialVersionUID = -3563282658560745370L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CreditTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CreditTaskQuery.java new file mode 100644 index 0000000000..3a43620877 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/CreditTaskQuery.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.terminal.api.risk.creditreview.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class CreditTaskQuery implements Query { + private static final long serialVersionUID = -6952737531036706114L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/SubmitCreditDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/SubmitCreditDto.java new file mode 100644 index 0000000000..87eb159fe8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/flowable/SubmitCreditDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.risk.creditreview.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto; +import com.yxt.anrui.terminal.api.risk.creditreview.CreditReviewSsDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SubmitCreditDto extends CreditReviewSsDto { + + private static final long serialVersionUID = 6134092944641545633L; + + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java index 5b7a8f5aa0..3c97deecca 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java @@ -1,6 +1,10 @@ package com.yxt.anrui.terminal.biz.risk.creditreview; import com.yxt.anrui.terminal.api.risk.creditreview.*; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CompleteCreditDto; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditTaskQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.SubmitCreditDto; import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.AppFinOtherPolicyApplyInitVo; import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.OtherPolicyRecordApplyFeign; import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.CompleteOtherPolicyDto; @@ -84,6 +88,36 @@ public class CreditReviewRest implements CreditReviewFeign { return creditReviewService.saveCreditReviewInfo3(dto); } + @Override + public ResultBean submitCreditInfo(SubmitCreditDto dto) { + return creditReviewService.submitCreditInfo(dto); + } + + @Override + public ResultBean agreeCreditInfo(CompleteCreditDto dto) { + return creditReviewService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(CreditTaskQuery query) { + return creditReviewService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(CreditTaskQuery query) { + return creditReviewService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(CreditTaskQuery query) { + return creditReviewService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(CreditQuery query) { + return creditReviewService.getFlowOperateTitle(query); + } + @Override public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { return creditReviewService.submitCreditReviewInfo(dto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index bf768f274e..c936cf6826 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -6,6 +6,9 @@ import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo; +import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery; +import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo; +import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -15,6 +18,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDto; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyFeign; +import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.*; import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDetailsVo; import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankDto; @@ -30,6 +34,10 @@ import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageQuery; import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo; import com.yxt.anrui.terminal.api.risk.creditreview.*; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CompleteCreditDto; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.CreditTaskQuery; +import com.yxt.anrui.terminal.api.risk.creditreview.flowable.SubmitCreditDto; import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.AppFinOtherPolicyApplyInitVo; import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.CompleteOtherPolicyDto; import com.yxt.anrui.terminal.api.risk.otherpolicyrecordapply.flow.OtherPolicyFlowableQuery; @@ -256,11 +264,12 @@ public class CreditReviewService { public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); CreditReviewDetailsSsVo creditReviewDetailsSsVo = new CreditReviewDetailsSsVo(); - SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); - SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo; if (query.getAddNew()) { loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); + creditReviewDetailsSsVo.setSid2(query.getSid()); + creditReviewDetailsSsVo.setOrgPath(query.getOrgPath()); + creditReviewDetailsSsVo.setUserSid(query.getUserSid()); } else { LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(query.getSid()).getData(); loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData(); @@ -277,11 +286,13 @@ public class CreditReviewService { } creditReviewDetailsSsVo.setGuarantorList(shareholderDetailsVos); creditReviewDetailsSsVo.setUploadFiles(loanCreditAppealApplyDetailsVo.getSsImages()); - creditReviewDetailsSsVo.setPublishInfo(sysOrganizationVoBM.getName() + sysUserVo.getName()); - creditReviewDetailsSsVo.setOrgPath(query.getOrgPath()); - creditReviewDetailsSsVo.setUserSid(query.getUserSid()); + creditReviewDetailsSsVo.setOrgPath(loanCreditAppealApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsSsVo.setUserSid(loanCreditAppealApplyDetailsVo.getCreateBySid()); + creditReviewDetailsSsVo.setSid2(loanCreditAppealApplyDetailsVo.getCreditApplySid()); + creditReviewDetailsSsVo.setSid(loanCreditAppealApplyDetailsVo.getSid()); + creditReviewDetailsSsVo.setTaskId(loanCreditAppealApplyDetailsVo.getTaskId()); + creditReviewDetailsSsVo.setProcInsId(loanCreditAppealApplyDetailsVo.getInstanceId()); } - creditReviewDetailsSsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); creditReviewDetailsSsVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); creditReviewDetailsSsVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); creditReviewDetailsSsVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); @@ -293,14 +304,11 @@ public class CreditReviewService { creditReviewDetailsSsVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); creditReviewDetailsSsVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); creditReviewDetailsSsVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); - creditReviewDetailsSsVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); - creditReviewDetailsSsVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); creditReviewDetailsSsVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); creditReviewDetailsSsVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); creditReviewDetailsSsVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); creditReviewDetailsSsVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); creditReviewDetailsSsVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName()); - //creditReviewDetailsSsVo.setDownUrl(); //参数优化 query.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); //风控要求的其他人员 @@ -624,6 +632,20 @@ public class CreditReviewService { creditReviewDetailsSsVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); //申诉结果 creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason()); + List loanCreditAppealPeos = loanCreditAppealApplyDetailsVo.getLoanCreditAppealPeos(); + List shareholderDetailsVos2 = new ArrayList<>(); + for (LoanCreditAppealPeoDetailsVo loanCreditAppealPeo : loanCreditAppealPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanCreditAppealPeo.getName()); + shareholderDetailsVo.setShareholderIdNumber(loanCreditAppealPeo.getIdCard()); + shareholderDetailsVo.setShareholderMobile(loanCreditAppealPeo.getPhone()); + shareholderDetailsVo.setShareholderRemarks(loanCreditAppealPeo.getRemarks()); + shareholderDetailsVos2.add(shareholderDetailsVo); + } + creditReviewDetailsSsVo.setGuarantorList(shareholderDetailsVos2); + creditReviewDetailsSsVo.setUploadFiles(loanCreditAppealApplyDetailsVo.getSsImages()); + creditReviewDetailsSsVo.setTaskId(loanCreditAppealApplyDetailsVo.getTaskId()); + creditReviewDetailsSsVo.setProcInsId(loanCreditAppealApplyDetailsVo.getInstanceId()); return rb.success().setData(creditReviewDetailsSsVo); } @@ -691,32 +713,141 @@ public class CreditReviewService { LoanCreditAppealApplyDto loanCreditAppealApplyDto = new LoanCreditAppealApplyDto(); List guarantorList = dto.getGuarantorList(); List loanCreditAppealPeoDtos = new ArrayList<>(); - for (ShareholderDetailsVo shareholderDetailsVo : guarantorList) { - LoanCreditAppealPeoDto loanCreditAppealPeoDto = new LoanCreditAppealPeoDto(); - loanCreditAppealPeoDto.setName(shareholderDetailsVo.getShareholderName()); - loanCreditAppealPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); - loanCreditAppealPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); - loanCreditAppealPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); - loanCreditAppealPeoDtos.add(loanCreditAppealPeoDto); - } - loanCreditAppealApplyDto.setLoanCreditAppealPeos(loanCreditAppealPeoDtos); + loanCreditAppealApplyDto.setSid(dto.getSid()); loanCreditAppealApplyDto.setAppealReason(dto.getReason()); loanCreditAppealApplyDto.setSsImages(dto.getUploadFiles()); SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData(); loanCreditAppealApplyDto.setCreateBySid(sysUserVo.getSid()); loanCreditAppealApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid()); - String[] publishInfos = dto.getPublishInfo().split("-"); - loanCreditAppealApplyDto.setApplyDeptName(publishInfos[0]); - loanCreditAppealApplyDto.setCreateByName(publishInfos[1]); + loanCreditAppealApplyDto.setApplyDeptName(sysOrganizationVoBM.getName()); + loanCreditAppealApplyDto.setCreateByName(sysUserVo.getName()); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); loanCreditAppealApplyDto.setOrgSidPath(dto.getOrgPath()); loanCreditAppealApplyDto.setUseOrgSid(useOrgSid); loanCreditAppealApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); + loanCreditAppealApplyDto.setCreditApplySid(dto.getSid2()); + for (ShareholderDetailsVo shareholderDetailsVo : guarantorList) { + LoanCreditAppealPeoDto loanCreditAppealPeoDto = new LoanCreditAppealPeoDto(); + loanCreditAppealPeoDto.setName(shareholderDetailsVo.getShareholderName()); + loanCreditAppealPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanCreditAppealPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanCreditAppealPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanCreditAppealPeoDto.setCreateByName(sysUserVo.getName()); + loanCreditAppealPeoDtos.add(loanCreditAppealPeoDto); + } + loanCreditAppealApplyDto.setLoanCreditAppealPeos(loanCreditAppealPeoDtos); loanCreditAppealApplyFeign.save(loanCreditAppealApplyDto); return new ResultBean().success(); } + public ResultBean submitCreditInfo(SubmitCreditDto dto) { + ResultBean rb = ResultBean.fireFail(); + SubmitLoanCreditApplyDto submitLoanCreditApplyDto = new SubmitLoanCreditApplyDto(); + List guarantorList = dto.getGuarantorList(); + List loanCreditAppealPeoDtos = new ArrayList<>(); + submitLoanCreditApplyDto.setInstanceId(dto.getInstanceId()); + submitLoanCreditApplyDto.setTaskId(dto.getTaskId()); + submitLoanCreditApplyDto.setSid(dto.getSid()); + submitLoanCreditApplyDto.setAppealReason(dto.getReason()); + submitLoanCreditApplyDto.setSsImages(dto.getUploadFiles()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData(); + submitLoanCreditApplyDto.setCreateBySid(sysUserVo.getSid()); + submitLoanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid()); + submitLoanCreditApplyDto.setApplyDeptName(sysOrganizationVoBM.getName()); + submitLoanCreditApplyDto.setCreateByName(sysUserVo.getName()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + submitLoanCreditApplyDto.setOrgSidPath(dto.getOrgPath()); + submitLoanCreditApplyDto.setUseOrgSid(useOrgSid); + submitLoanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); + submitLoanCreditApplyDto.setCreditApplySid(dto.getSid2()); + for (ShareholderDetailsVo shareholderDetailsVo : guarantorList) { + LoanCreditAppealPeoDto loanCreditAppealPeoDto = new LoanCreditAppealPeoDto(); + loanCreditAppealPeoDto.setName(shareholderDetailsVo.getShareholderName()); + loanCreditAppealPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanCreditAppealPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanCreditAppealPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanCreditAppealPeoDto.setCreateByName(sysUserVo.getName()); + loanCreditAppealPeoDtos.add(loanCreditAppealPeoDto); + } + submitLoanCreditApplyDto.setLoanCreditAppealPeos(loanCreditAppealPeoDtos); + ResultBean resultBean = loanCreditAppealApplyFeign.submitLoanCreditApply(submitLoanCreditApplyDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean agreeCreditInfo(CompleteCreditDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanCreditApplyCompleteDto loanCreditApplyCompleteDto = new LoanCreditApplyCompleteDto(); + BeanUtil.copyProperties(dto, loanCreditApplyCompleteDto); + loanCreditAppealApplyFeign.complete(loanCreditApplyCompleteDto); + return rb.success(); + } + public ResultBean rejectCreditInfo(CreditTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + LoanCreditApplyTaskQuery taskQuery = new LoanCreditApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = loanCreditAppealApplyFeign.reject(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(CreditTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + LoanCreditApplyTaskQuery taskQuery = new LoanCreditApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = loanCreditAppealApplyFeign.revokeProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(CreditTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + LoanCreditApplyTaskQuery taskQuery = new LoanCreditApplyTaskQuery(); + BeanUtil.copyProperties(query, taskQuery); + ResultBean resultBean = loanCreditAppealApplyFeign.breakProcess(taskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(CreditQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + LoanCreditApplyNodeQuery getNodeQuery = new LoanCreditApplyNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> previousNodesForReject = loanCreditAppealApplyFeign.getPreviousNodesForReject(getNodeQuery); + if (previousNodesForReject.getSuccess()) { + previousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = previousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(previousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> nextNodesForSubmit = loanCreditAppealApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (nextNodesForSubmit.getSuccess()) { + nextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = nextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(nextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + return rb.success().setData(data); + } }