diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java index dd20bffae6..d879959bb4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java @@ -88,7 +88,9 @@ public class AppArrearsCarryDto implements Dto { //是否金融部复核 @ApiModelProperty("是否金融部复核，1是，0否") private String isFinance; + @ApiModelProperty("金融人员用户sid") private String financeUserSid; + @ApiModelProperty("金融人员") private String financeName; @ApiModelProperty("实例id") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index d0adadf2dc..5b30f18e1b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -106,7 +106,7 @@ public interface BusArrearsCarryVehicleApplyFeign { @ApiOperation("详情") @GetMapping("/details") @ResponseBody - ResultBean details(@RequestParam("sid")String sid); + ResultBean details(@RequestParam("sid") String sid); @ApiOperation("提交流程") @PostMapping("/submitAdvanceArrearsInfo") @@ -118,6 +118,11 @@ public interface BusArrearsCarryVehicleApplyFeign { @ResponseBody public ResultBean complete(@Valid @RequestBody AppCompleteAdvanceArrearsDto query); + @ApiOperation(value = "销售经理、销售内勤办理（同意）") + @PostMapping("/completeBy") + @ResponseBody + public ResultBean completeBy(@RequestBody CompleteByQuery query); + @ApiOperation(value = "办理（同意）") @PostMapping("/InitiatorToAnswerInfo") @ResponseBody diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 9fef0fe81a..678165fa59 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -117,6 +117,11 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry return null; } + @Override + public ResultBean completeBy(CompleteByQuery query) { + return null; + } + @Override public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/CompleteByQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/CompleteByQuery.java new file mode 100644 index 0000000000..881de26674 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/CompleteByQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class CompleteByQuery extends AppCompleteAdvanceArrearsDto { + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); + + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index 158e0d6c92..a2d78cfcfd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -112,7 +112,7 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return rb.success().setData(vo); }*/ - /* *//** + /* *//** * 欠款提车-车辆列表 * * @param pq @@ -145,9 +145,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return busArrearsCarryVehicleApplyService.submitArrearsCarryVehicle(dto); } - *//** + */ + + /** * 欠款提车单附件保存接口 - * *//* @Override public ResultBean saveArrearsAppendix(List list) { @@ -204,6 +205,11 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return busArrearsCarryVehicleApplyService.complete(bv); } + @Override + public ResultBean completeBy(CompleteByQuery query) { + return busArrearsCarryVehicleApplyService.completeBy(query); + } + @Override public ResultBean InitiatorToAnswerInfo(AppCompleteAdvanceArrearsDto query) { BusinessVariables bv = new BusinessVariables(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 6bf5cdc851..5890160aac 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -27,10 +27,7 @@ import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeQuery; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.GetNodeVo; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetails; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; @@ -991,9 +988,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService stringLists = Arrays.asList(commitmentMoneyDate.split("-")); - map.put("year",stringLists.get(0)); - map.put("month",stringLists.get(1)); - map.put("day",stringLists.get(2)); + map.put("year", stringLists.get(0)); + map.put("month", stringLists.get(1)); + map.put("day", stringLists.get(2)); //车辆信息 ResultBean resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(dto.getContractId()); if (resultBean.getSuccess()) { @@ -1211,7 +1208,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid()); + if (StringUtils.isNotBlank(appOrderDetailsVo.getPurchaseSystemSid())) { + ResultBean invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); if (invoicingDetailsVoResultBean.getData() != null) { map.put("orgName", invoicingDetailsVoResultBean.getData().getName()); } } - map.put("mobile",appOrderDetailsVo.getPhone()); + map.put("mobile", appOrderDetailsVo.getPhone()); ResultBean crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()); if (crmResultBean.getSuccess()) { CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData(); @@ -1365,9 +1362,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carContract = dto.getCarContract(); @@ -1437,9 +1434,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService guaranteeLetter = dto.getGuaranteeLetter(); if (!guaranteeLetter.isEmpty()) { String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages); - }else{ + } else { busArrearsCarryVehicleApply.setGuaranteeLetterFile(""); } List gdLetter = dto.getGdLetter(); if (!gdLetter.isEmpty()) { String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages); - }else{ + } else { busArrearsCarryVehicleApply.setGdLetterFile(""); } List zjlLetter = dto.getZjlLetter(); if (!zjlLetter.isEmpty()) { String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages); - }else{ + } else { busArrearsCarryVehicleApply.setZjlLetterFile(""); } List otherFile = dto.getFileList(); if (!otherFile.isEmpty()) { String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), ""); busArrearsCarryVehicleApply.setOtherFile(fileLists); - }else{ + } else { busArrearsCarryVehicleApply.setOtherFile(""); } //车辆 @@ -1731,14 +1728,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData(); - for (SysUserVo userVo : list4) { - recipientSidList.add(userVo.getSid()); - } - // 风控中心风控内勤 - UserRoleQuery userRoleQuery = new UserRoleQuery(); - userRoleQuery.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4"); - List list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); - for (SysUserVo userVo : list1) { - recipientSidList.add(userVo.getSid()); - } - // 分公司会计角色用户 - UserQuery userQuery = new UserQuery(); - userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a"); - userQuery.setOrgSidPath(bv.getOrgSidPath()); - List list = sysUserFeign.getUserByRole(userQuery).getData(); - for (SysUserVo userVo : list) { - recipientSidList.add(userVo.getSid()); - } - //财务中心总经理角色用户 - UserRoleQuery userRoleQuery3 = new UserRoleQuery(); - userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155"); - List list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData(); - for (SysUserVo userVo : list3) { - recipientSidList.add(userVo.getSid()); - } - //事业部运营经理角色用户 - UserRoleQuery userRoleQuery2 = new UserRoleQuery(); - userRoleQuery2.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725"); - List list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData(); - for (SysUserVo userVo : list2) { - recipientSidList.add(userVo.getSid()); - } - query.setRecipientSidList(recipientSidList); - query.setAppMap(appMaps); - query.setMsgTitle("业务"); - query.setMsgContent(sysUserVo.getName() + "提交的欠款提车申请,请查阅"); - query.setMsgSource("业务"); - query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri()); - query.setApp_type("2"); - query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); - query.setName("业务"); - // 消息推送 - messageFeign.sendAutoserviceMessage(query);*/ } return rb.success().setData(resultBean.getData()); } else { @@ -1956,54 +1898,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData(); - for (SysUserVo userVo : list4) { - recipientSidList.add(userVo.getSid()); - } - // 风控中心风控内勤 - UserRoleQuery userRoleQuery2 = new UserRoleQuery(); - userRoleQuery2.setRoleSid("967e63b0-3b7a-49ed-b42a-d4f904ab84f4"); - List list1 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery2).getData(); - for (SysUserVo userVo : list1) { - recipientSidList.add(userVo.getSid()); - } - // 分公司会计角色用户 - UserQuery userQuery = new UserQuery(); - userQuery.setRoleSid("94e3e298-e934-42d2-af02-50e93eee583a"); - userQuery.setOrgSidPath(bv.getOrgSidPath()); - List list = sysUserFeign.getUserByRole(userQuery).getData(); - for (SysUserVo userVo : list) { - recipientSidList.add(userVo.getSid()); - } - //财务中心总经理角色用户 - UserRoleQuery userRoleQuery3 = new UserRoleQuery(); - userRoleQuery3.setRoleSid("b2bcdfd6-ac51-408c-9c7a-7e9818d23155"); - List list3 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery3).getData(); - for (SysUserVo userVo : list3) { - recipientSidList.add(userVo.getSid()); - } - //事业部运营经理角色用户 - UserRoleQuery userRoleQuery4 = new UserRoleQuery(); - userRoleQuery4.setRoleSid("f60b30b0-c7ad-4533-8367-b3ff95cbe725"); - List list2 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery4).getData(); - for (SysUserVo userVo : list2) { - recipientSidList.add(userVo.getSid()); - } - query.setRecipientSidList(recipientSidList); - query.setAppMap(appMaps); - query.setMsgTitle("业务"); - query.setMsgContent(userVos.getName() + "提交的欠款提车申请,请查阅"); - query.setMsgSource("业务"); - query.setMsgTargetUri(MsgTargetUriEnum.TQKPSQTS.getUri()); - query.setApp_type("2"); - query.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028"); - query.setName("业务"); - // 消息推送 - messageFeign.sendAutoserviceMessage(query);*/ } return rb.success().setData(resultBean1.getData()); @@ -2297,4 +2191,58 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carContract = query.getCarContract(); + if (carContract.isEmpty()) { + return rb.setMsg("请上传车辆买卖合同"); + } else { + String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setCarContractFile(carContractImages); + } + List guaranteeLetter = query.getGuaranteeLetter(); + if (guaranteeLetter.isEmpty()) { + return rb.setMsg("请上传欠款提车担保承诺书"); + } else { + String guaranteeLetterImages = String.join(",", guaranteeLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setGuaranteeLetterFile(guaranteeLetterImages); + } + List gdLetter = query.getGdLetter(); + if (!gdLetter.isEmpty()) { + String gdLetterImages = String.join(",", gdLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setGdLetterFile(gdLetterImages); + } + List zjlLetter = query.getZjlLetter(); + if (zjlLetter.isEmpty()) { + return rb.setMsg("请上传总经理担保书"); + } else { + String zjlLetterImages = String.join(",", zjlLetter).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages); + } + List fileList = query.getFileList(); + if (fileList.isEmpty()) { + return rb.setMsg("请上传其他附件"); + } else { + String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setOtherFile(fileLists); + } + baseMapper.updateById(busArrearsCarryVehicleApply); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + ResultBean resultBean = complete(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e1675aa69e..869ef7ed81 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6084,7 +6084,8 @@ public class BusSalesOrderService extends MybatisBaseService getFlowOperateTitle(@SpringQueryMap AdvanceArrearsQuery query); + + @ApiOperation("获取下一环节") + @GetMapping("/getFlowOperateTitleBy") + @ResponseBody + ResultBean getFlowOperateTitleBy(@SpringQueryMap ArrearsQuery query); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java index 89f7b90a88..840419f38c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java @@ -1,9 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*; +import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractFlowListVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -77,6 +75,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear return null; } + @Override + public ResultBean agreeArrearsApplyInfoBy(AppCompleteQuery query) { + return null; + } + @Override public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) { return null; @@ -101,4 +104,9 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear public ResultBean getFlowOperateTitle(AdvanceArrearsQuery query) { return null; } + + @Override + public ResultBean getFlowOperateTitleBy(ArrearsQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AppCompleteQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AppCompleteQuery.java new file mode 100644 index 0000000000..32c9de7bcc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/AppCompleteQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AppCompleteQuery extends CompleteArrearsTakeCarDto { + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearVo.java new file mode 100644 index 0000000000..982e30f236 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ArrearVo { + + @ApiModelProperty("标题：如身份证") + private String title; + // 类型 1（上传图片） + private int type; + // 是否可空， 可不填 true + private boolean nullAble; + // 保存字段名称 + private String key; + // 保存图片使用 type=1 + private List filesPath = new ArrayList<>(); + // 保存文本使用 + private String text; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsQuery.java new file mode 100644 index 0000000000..c9628859ad --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class ArrearsQuery { + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误：next") + private Integer next = 1; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsVo.java new file mode 100644 index 0000000000..6ffc2940ac --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/flowable/ArrearsVo.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ArrearsVo { + + private String title; + private List list = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java index 0169678cca..077f8ff0bd 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java @@ -1,14 +1,7 @@ package com.yxt.anrui.terminal.biz.arrearsTakeCar; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; -import com.yxt.common.base.utils.PagerUtil; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -94,6 +87,11 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh return appBusArrearsCarryVehicleApplyService.agreeArrearsApplyInfo(dto); } + @Override + public ResultBean agreeArrearsApplyInfoBy(AppCompleteQuery query) { + return appBusArrearsCarryVehicleApplyService.agreeArrearsApplyInfoBy(query); + } + @Override public ResultBean initiatorToAnswer(CompleteArrearsTakeCarDto dto) { return appBusArrearsCarryVehicleApplyService.initiatorToAnswer(dto); @@ -118,4 +116,9 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh public ResultBean getFlowOperateTitle(AdvanceArrearsQuery query) { return appBusArrearsCarryVehicleApplyService.getFlowOperateTitle(query); } + + @Override + public ResultBean getFlowOperateTitleBy(ArrearsQuery query) { + return appBusArrearsCarryVehicleApplyService.getFlowOperateTitleBy(query); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 090f449f88..410e148db7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -14,10 +14,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery; import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.*; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto; -import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.SubmitArrearsTakeCarDto; +import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -95,7 +92,7 @@ public class AppBusArrearsCarryVehicleApplyService { AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto(); BeanUtil.copyProperties(dto, appArrearsCarryDto); ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApply(appArrearsCarryDto); - if(!resultBean.getSuccess()){ + if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } return rb.success(); @@ -233,7 +230,7 @@ public class AppBusArrearsCarryVehicleApplyService { public ResultBean> getCanUseCars(CarsQuery query) { ResultBean> rb = ResultBean.fireFail(); QCarQuery qCarQuery = new QCarQuery(); - BeanUtil.copyProperties(query,qCarQuery); + BeanUtil.copyProperties(query, qCarQuery); ResultBean> resultBean = busSalesOrderVehicleFeign.getCanUseCars(qCarQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -253,10 +250,101 @@ public class AppBusArrearsCarryVehicleApplyService { ResultBean rb = ResultBean.fireFail(); AdvanceArrearsInfoVo advanceArrearsInfoVo = new AdvanceArrearsInfoVo(); ResultBean resultBean = busArrearsCarryVehicleApplyFeign.details(sid); - if(!resultBean.getSuccess()){ + if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } - BeanUtil.copyProperties(resultBean.getData(),advanceArrearsInfoVo); + BeanUtil.copyProperties(resultBean.getData(), advanceArrearsInfoVo); return rb.success().setData(advanceArrearsInfoVo); } + + public ResultBean agreeArrearsApplyInfoBy(AppCompleteQuery query) { + ResultBean rb = ResultBean.fireFail(); + CompleteByQuery completeByQuery = new CompleteByQuery(); + BeanUtil.copyProperties(query, completeByQuery); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.completeBy(completeByQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } + + public ResultBean getFlowOperateTitleBy(ArrearsQuery query) { + ResultBean rb = ResultBean.fireFail(); + ArrearsVo arrearsVo = new ArrearsVo(); + //0 上一环节 1下一环节 + int next = query.getNext(); + GetNodeQuery getNodeQuery = new GetNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = busArrearsCarryVehicleApplyFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误：next"); + } + arrearsVo.setTitle(data); + ResultBean details = details(query.getBusinessSid()); + List list = new ArrayList<>(); + AdvanceArrearsInfoVo advanceArrearsInfoVo = details.getData(); + if (advanceArrearsInfoVo != null) { + ArrearVo arrearVo = new ArrearVo(); + arrearVo.setTitle("车辆买卖合同（欠款）"); + arrearVo.setType(1); + arrearVo.setKey("carContract"); + arrearVo.setNullAble(false); + List carContract = advanceArrearsInfoVo.getCarContract(); + arrearVo.setFilesPath(carContract); + list.add(arrearVo); + //================================================= + arrearVo = new ArrearVo(); + arrearVo.setTitle("欠款提车担保承诺书"); + arrearVo.setType(1); + arrearVo.setKey("guaranteeLetter"); + arrearVo.setNullAble(false); + List guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter(); + arrearVo.setFilesPath(guaranteeLetter); + list.add(arrearVo); + //================================================= + arrearVo = new ArrearVo(); + arrearVo.setTitle("股东会对外担保决议"); + arrearVo.setType(1); + arrearVo.setKey("gdLetter"); + arrearVo.setNullAble(true); + List gdLetter = advanceArrearsInfoVo.getGdLetter(); + arrearVo.setFilesPath(gdLetter); + list.add(arrearVo); + //================================================= + arrearVo = new ArrearVo(); + arrearVo.setTitle("总经理担保书"); + arrearVo.setType(1); + arrearVo.setKey("zjlLetter"); + arrearVo.setNullAble(false); + List zjlLetter = advanceArrearsInfoVo.getZjlLetter(); + arrearVo.setFilesPath(zjlLetter); + list.add(arrearVo); + arrearVo = new ArrearVo(); + arrearVo.setTitle("其他附件"); + arrearVo.setType(1); + arrearVo.setKey("fileList"); + arrearVo.setNullAble(false); + List fileList = advanceArrearsInfoVo.getFileList(); + arrearVo.setFilesPath(fileList); + list.add(arrearVo); + arrearsVo.setList(list); + } + return rb.success().setData(arrearsVo); + } } \ No newline at end of file