From 2c911d4989080962e6e8b10eb9f8f7444398f43d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 18 Jul 2023 17:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusVehicleOrderService.java | 3 + .../busmaindeposit/BusMainDepositFeign.java | 10 - .../BusMainDepositFeignFallback.java | 72 -- .../api/bussalesorder/BusSalesOrderFeign.java | 2 +- .../busmaindeposit/BusMainDepositRest.java | 153 ---- .../busmaindeposit/BusMainDepositService.java | 713 +----------------- .../FinCollectionConfirmationFeign.java | 2 +- ...inUncollectedReceivablesDetailedFeign.java | 2 +- 8 files changed, 27 insertions(+), 930 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index 424a4bdd1a..adc9b93165 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -555,6 +555,9 @@ public class BusVehicleOrderService extends MybatisBaseService selectDepositVehBySid(@PathVariable("sid") String sid); - /*************************************************PC虚拟订单审批流程***************************************************/ - - @ApiOperation("提交虚拟订单（订金）审批流程") - @PostMapping("/submitMainDespoitApprove") - public ResultBean submitMainDespoitApprove(@RequestBody @Valid BusDepositDto dto); - - @ApiOperation("提交虚拟订单（预定车辆）审批流程") - @PostMapping("/submitMainDespoitVehicleApprove") - public ResultBean submitMainDespoitVehicleApprove(@RequestBody @Valid BusMainDepositVehicleDto dto); - /*****************************************App端接口*********************************************/ diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java index 8dca4c834a..445050a695 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java @@ -125,78 +125,6 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign { return rb.setMsg("接口anrui-buscenter/busmaindeposit/selectDepositVehBySid无法访问"); } - @Override - public ResultBean submitMainDespoitApprove(BusDepositDto dto) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitApprove无法访问"); - } - - @Override - public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busmaindeposit/submitMainDespoitVehicleApprove无法访问"); - } -// -// @Override -// public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) { -// return null; -// } -// -// @Override -// public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) { -// return null; -// } -// -// @Override -// public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) { -// return null; -// } -// -// @Override -// public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) { -// return null; -// } -// -// @Override -// public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } -// -// @Override -// public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { -// return null; -// } - @Override public ResultBean> getVirtualOrders(PagerQuery pagerQuery) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 4f09b8d304..c247d80801 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -49,7 +49,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.List; /** - * Project: anrui-buscenter(业务管理)
+ * Project: anrui-buscenter(业务管理-销售订单)
* File: BusSalesOrderFeign.java
* Class: com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign
* Description: 销售订单主表.
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java index d5a8c0de4e..1709468f7a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java @@ -99,14 +99,6 @@ public class BusMainDepositRest implements BusMainDepositFeign { return busMainDepositService.saveDepositVehicle(dto); } - /*@Override - public ResultBean updateDeposit(BusDepositDto dto, String sid) { - if (dto.getPaymentProofList() != null && dto.getPaymentProofList().size() > 1) { - return new ResultBean().fail().setMsg("只可上传一张付款凭证"); - } - return saveDeposit(dto);// busMainDepositService.updateDeposit(dto, sid); - }*/ - @Override public ResultBean updateDepositVehicle(BusMainDepositVehicleDto dto, String sid) { return busMainDepositService.updateDepositVehicle(dto, sid); @@ -155,153 +147,11 @@ public class BusMainDepositRest implements BusMainDepositFeign { return busMainDepositService.selectDepositVehBySid(sid); } - /*************************************************虚拟订单审批流程***************************************************/ - - @Override - public ResultBean submitMainDespoitApprove(BusDepositDto dto) { - return busMainDepositService.submitMainDespoitApprove(dto); - } - - @Override - public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) { - return busMainDepositService.submitMainDespoitVehicleApprove(dto); - } - - /*************************************************APP虚拟订单订金审批流程***************************************************/ - - /** - * 提交流程 - * - * @param dto - * @return - */ - /*@Override - public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) { - return busMainDepositService.submitAppMainDespoitApprove(dto); - }*/ - - /** - * 重新提交流程 - * - * @param dto - * @return - */ - /*@Override - public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) { - return busMainDepositService.reSubmitAppMainDespoitApprove(dto); - }*/ - /** - * 同意 - * - * @param appBusMainDepositFlowTask - * @return - */ - /* @Override - public ResultBean agreeDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.agreeDeposit(appBusMainDepositFlowTask); - }*/ - /** - * 撤回 - * - * @param appBusMainDepositFlowTask - * @return - */ - /*@Override - public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.recallDeposit(appBusMainDepositFlowTask); - }*/ - - /** - * 驳回 - * - * @param appBusMainDepositFlowTask - * @return - */ - /*@Override - public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.rejectDeposit(appBusMainDepositFlowTask); - }*/ - - /** - * 驳回 - * - * @param appBusMainDepositFlowTask - * @return - */ - /*@Override - public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.stopDeposit(appBusMainDepositFlowTask); - }*/ /*************************************************APP虚拟订单预定车辆审批流程***************************************************/ - /** - * 提交审批 - * - * @param dto - * @return - */ - /*@Override - public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) { - return busMainDepositService.submitAppMainDespoitVehicleApprove(dto); - }*/ - /** - * 从新提交审批 - * - * @param dto - * @return - */ - /*@Override - public ResultBean reSubmitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) { - return busMainDepositService.reSubmitAppMainDespoitVehicleApprove(dto); - }*/ - - /** - * 同意 - * - * @param appBusMainDepositFlowTask - * @return - */ - /*@Override - public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.agreeReserveCar(appBusMainDepositFlowTask); - }*/ - - /** - * 终止 - * - * @param appBusMainDepositFlowTask - * @return - */ - /* @Override - public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.recallReserveCar(appBusMainDepositFlowTask); - }*/ - - /** - * 驳回 - * - * @param appBusMainDepositFlowTask - * @return - */ - /*@Override - public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.rejectReserveCar(appBusMainDepositFlowTask); - }*/ - - /** - * 撤回 - * - * @param appBusMainDepositFlowTask - * @return - */ - /*@Override - public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - return busMainDepositService.stopReserveCar(appBusMainDepositFlowTask); - }*/ - /****************************************************************************************************/ /** * 虚拟订单列表（新） * @@ -319,9 +169,6 @@ public class BusMainDepositRest implements BusMainDepositFeign { @Override public ResultBean saveDepositInfo(AppBusDepositBuscenterDto dto) { -// if (dto.getPayImages() != null && dto.getPayImages().size() > 1) { -// return new ResultBean().fail().setMsg("只可上传一张付款凭证"); -// } return busMainDepositService.saveDepositInfo(dto); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 6b2026b139..6453207b27 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -171,9 +171,6 @@ public class BusMainDepositService extends MybatisBaseService listPage(PagerQuery pq) { @@ -675,13 +668,13 @@ public class BusMainDepositService extends MybatisBaseService rb = ResultBean.fireFail(); SysUserVo data = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); String useOrgSid = ""; - if(StringUtils.isNotBlank(dto.getOrgPath())){ + if (StringUtils.isNotBlank(dto.getOrgPath())) { useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); - }else{ + } else { useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); } SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -859,13 +852,13 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); -// variables.put("businessSid", businessSid); -// variables.put("isLoan", true); -// variables.put("orgSid", orgSid);//部门sid -// ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); -// if (resultBean.getSuccess() && resultBean.getData() != null) { -// Map map = (Map) resultBean.getData(); -// /*saveSysFormLink(map);*/ -// //更新虚拟订单审批（订金）业务表中的流程状态 -// modifiBusMainDepositFlowState(businessSid, -// ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId -// map.get("nodeState"),//state -// map.get("procInsId"),//procInstSid -// map.get("taskDefKey")//nodeSid -// ); -// } - return new ResultBean(); - } - -// private void modifiBusMainDepositFlowState(String businessSid, -// String proDefId,//procDefId -// String nodeState,//state -// String procInsId,//procInstSid -// String taskDefKey//nodeSid -// ) { -// baseMapper.modifiBusDepositFlowState(businessSid, -// proDefId,//procDefId -// nodeState,//state -// procInsId,//procInstSid -// taskDefKey); -// } - /*public ResultBean submitMainDespoitApprove(BusDepositDto dto) { - String orgSid = checkUserOrg(dto.getUserSid()); - String businessSid = ""; - if (StringUtils.isBlank(orgSid)) { - return new ResultBean().fail().setMsg("用户组织机构不能为空"); - } - // 验证 - if (StringUtils.isBlank(dto.getSid())) { - // 调用保存接口 - ResultBean resultBean = saveDeposit(dto); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = resultBean.getData().toString(); - } else { - // 调用更新接口 - ResultBean resultBean = updateDeposit(dto, dto.getSid()); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = dto.getSid(); - } - // ???待完善(根据虚拟订单审批流程) - Map variables = new HashMap<>(); - variables.put("businessSid", businessSid); - variables.put("isLoan", true); - variables.put("orgSid", orgSid);//部门sid - ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); - if (resultBean.getSuccess() && resultBean.getData() != null) { - Map map = (Map) resultBean.getData(); - saveSysFormLink(map); - } - return resultBean; - }*/ - - /** - * 保存流程业务关联表 数据 - * - * @param map - */ - private void saveSysFormLink(Map map) { - String sid = map.get("sid"); - ResultBean resultBean = sysFormLinkFeign.selectByBusinessSid(sid); - if (!resultBean.getSuccess()) { // 新增 - SysFormLinkDto sysFormLinkDto = new SysFormLinkDto(); - sysFormLinkDto.setBusinessSid(map.get("sid")); - sysFormLinkDto.setProcInsId(map.get("procInsId")); - sysFormLinkDto.setTaskDefKey(map.get("taskDefKey")); - sysFormLinkDto.setNodeState(map.get("nodeState")); - sysFormLinkDto.setFormType(SysFormLinkTypeEnum.ORDER_DEPOSIT_VEHICLE.getCode()); -// sysFormLinkDto.setFlowState(Integer.parseInt(SysFormLinkFlowStateEnum.PROCESSING.getCode())); - sysFormLinkFeign.save(sysFormLinkDto); - } else { // 更新 - Map updateMap = new HashMap<>(); - updateMap.put("businessSid", sid); - updateMap.put("nodeState", map.get("nodeState")); - updateMap.put("taskDefKey", map.get("taskDefKey")); -// updateMap.put("flowState", SysFormLinkFlowStateEnum.PROCESSING.getCode()); - sysFormLinkFeign.updateFiled(updateMap); - } - - } - - /** - * 检查用户是否设置部门 - * - * @param userSid - * @return 返回部门sid - */ - private String checkUserOrg(String userSid) { - String orgSid = ""; - String staffSid = sysUserFeign.selectBySid(userSid).getData().getStaffSid(); - ResultBean resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid); - if (resultBean.getSuccess()) { - orgSid = resultBean.getData(); - } - return orgSid; - } - - /** - * 提交虚拟订单审批（预定车辆）流程 - * - * @param dto - * @return - */ - public ResultBean submitMainDespoitVehicleApprove(BusMainDepositVehicleDto dto) { -// String orgSid = checkUserOrg(dto.getUserSid()); -// String businessSid = ""; -// if (StringUtils.isBlank(orgSid)) { -// return new ResultBean().fail().setMsg("用户组织机构不能为空"); -// } -// // 验证 -// if (StringUtils.isBlank(dto.getSid())) { -// // 调用保存接口 -// ResultBean resultBean = saveDepositVehicle(dto); -// if (!resultBean.getSuccess()) { -// return resultBean.setMsg("提交失败"); -// } -// businessSid = resultBean.getData().toString(); -// } else { -// // 调用更新接口 -// ResultBean resultBean = updateDepositVehicle(dto, dto.getSid()); -// if (!resultBean.getSuccess()) { -// return resultBean.setMsg("提交失败"); -// } -// businessSid = dto.getSid(); -// } -// Map variables = new HashMap<>(); -// variables.put("businessSid", businessSid); -// variables.put("isLoan", true); -// variables.put("orgSid", orgSid); -// ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); -// if (resultBean.getSuccess() && resultBean.getData() != null) { -// Map map = (Map) resultBean.getData(); -// saveSysFormLink(map); -// } - return new ResultBean(); - } - - /** - * APP提交虚拟订单审批（订金）流程 - * - * @param dto - * @return - */ - public ResultBean submitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) { - String orgSid = checkUserOrg(dto.getUserSid()); - String businessSid = ""; - if (StringUtils.isBlank(orgSid)) { - return new ResultBean().fail().setMsg("用户组织机构不能为空"); - } - // 验证 - if (StringUtils.isBlank(dto.getVirtualOrderSid())) { - // 调用保存/修改接口 - ResultBean resultBean = saveDepositInfo(dto); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = resultBean.getData().toString(); - } else { - businessSid = dto.getVirtualOrderSid(); - } - Map variables = new HashMap<>(); - variables.put("businessSid", businessSid); - variables.put("isLoan", false); - variables.put("orgSid", orgSid); - ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); - if (resultBean.getSuccess() && resultBean.getData() != null) { - Map map = (Map) resultBean.getData(); - baseMapper.updateByNodeState(map.get("nodeState"), businessSid); - saveSysFormLink(map); - } - return new ResultBean().success(); - } - - /** - * APP重新提交虚拟订单审批（订金）流程 - * - * @param dto - * @return - */ - public ResultBean reSubmitAppMainDespoitApprove(AppBusDepositBuscenterDto dto) { - - String businessSid = ""; - if (StringUtils.isBlank(dto.getUserSid())) { - return new ResultBean().fail().setMsg("用户sid不能为空"); - } - // 验证 - if (StringUtils.isBlank(dto.getVirtualOrderSid())) { - // 调用保存/修改接口 - ResultBean resultBean = saveDepositInfo(dto); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = resultBean.getData().toString(); - } else { - businessSid = dto.getVirtualOrderSid(); - } - Map variables = new HashMap<>(); - variables.put("taskId", dto.getTaskId()); - variables.put("procInsId", dto.getProcInsId()); - variables.put("businessSid", businessSid); - variables.put("userSid", dto.getUserSid()); - BusinessVariables bv = BusinessVariables.builder().build(); - bv.setFormVariables(variables); - ResultBean resultBean = flowTaskFeign.businessComplete(bv); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = ""; - String taskDefKey = ""; - Map paramMap = new HashMap<>(); - paramMap.put("sid", variables.get("businessSid").toString()); - if (resultBean.getData() != null) { - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); - if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) { - nodeState = listResultBean.getData().get(0).getName_(); - taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); - } else { - nodeState = ProcessStateEnum.FINISHED.getStateName(); - taskDefKey = "Event_end"; -// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); - } - } - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - updateFlowFiled(paramMap); - return resultBean; - } - - /** - * APP提交虚拟订单审批（预定车辆）流程 - * - * @param dto - * @return - */ - public ResultBean submitAppMainDespoitVehicleApprove(AppBusDepositVehicleDto dto) { - String orgSid = checkUserOrg(dto.getUserSid()); - String businessSid = ""; - if (StringUtils.isBlank(orgSid)) { - return new ResultBean().fail().setMsg("用户组织机构不能为空"); - } - // 验证 - if (StringUtils.isBlank(dto.getVirtualOrderSid())) { - // 调用保存/修改接口 - ResultBean resultBean = reserveCarInfo(dto); - if (!resultBean.getSuccess()) { - return resultBean.setMsg("提交失败"); - } - businessSid = resultBean.getData().toString(); - } else { - businessSid = dto.getVirtualOrderSid(); - } - Map variables = new HashMap<>(); - variables.put("businessSid", businessSid); - variables.put("isLoan", true); - variables.put("orgSid", orgSid); - ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); - if (resultBean.getSuccess() && resultBean.getData() != null) { - Map map = (Map) resultBean.getData(); - saveSysFormLink(map); - } - return new ResultBean().success(); - } - /** * 新增/修改虚拟订单（车辆预订） * @@ -1211,9 +917,9 @@ public class BusMainDepositService extends MybatisBaseService reserveCarInfo(AppBusDepositVehicleDto dto) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = ""; - if(StringUtils.isNotBlank(dto.getOrgPath())){ + if (StringUtils.isNotBlank(dto.getOrgPath())) { useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); - }else{ + } else { useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); } SysUserVo data = sysUserFeign.fetchBySid(dto.getUserSid()).getData(); @@ -1295,140 +1001,6 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); - variables.put("taskId", appBusMainDepositFlowTask.getTaskId()); - variables.put("procInsId", appBusMainDepositFlowTask.getProcInsId()); - variables.put("comment", appBusMainDepositFlowTask.getComment()); - variables.put("businessSid", appBusMainDepositFlowTask.getBusinessSid()); - variables.put("userSid", appBusMainDepositFlowTask.getUserSid()); - BusinessVariables bv = BusinessVariables.builder().build(); - bv.setFormVariables(variables); - ResultBean resultBean = flowTaskFeign.businessComplete(bv); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = ""; - String taskDefKey = ""; - Map paramMap = new HashMap<>(); - paramMap.put("sid", variables.get("businessSid").toString()); - if (resultBean.getData() != null) { - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); - if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) { - nodeState = listResultBean.getData().get(0).getName_(); - taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); - } else { - nodeState = ProcessStateEnum.FINISHED.getStateName(); - taskDefKey = "Event_end"; -// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); - } - } - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - updateFlowFiled(paramMap); - return resultBean; - } - - /** - * 订金撤回 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean recallDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); - String userSid = appBusMainDepositFlowTask.getUserSid(); - String businessSid = appBusMainDepositFlowTask.getBusinessSid(); - fl.setTaskId(appBusMainDepositFlowTask.getTaskId()); - fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId()); - fl.setComment(appBusMainDepositFlowTask.getComment()); - fl.setUserSid(userSid); - ResultBean> resultBean = flowTaskFeign.revokeProcess(fl); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = resultBean.getData().get(0).getName_(); - String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); - String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); - Map paramMap = new HashMap<>(); - paramMap.put("sid", businessSid); - if (incomingSourceRef.contains("start")) { -// paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState()); - paramMap.put("taskDefKey", taskDefKey); -// paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode()); - } else { - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - } - updateFlowFiled(paramMap); - return resultBean; - } - - /** - * 订金驳回 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean rejectDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); - String userSid = appBusMainDepositFlowTask.getUserSid(); - String businessSid = appBusMainDepositFlowTask.getBusinessSid(); - fl.setTaskId(appBusMainDepositFlowTask.getTaskId()); - fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId()); - fl.setComment(appBusMainDepositFlowTask.getComment()); - fl.setUserSid(userSid); - ResultBean> resultBean = flowTaskFeign.taskReject(fl); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = resultBean.getData().get(0).getName_(); - String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); - String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); - Map paramMap = new HashMap<>(); - paramMap.put("sid", businessSid); - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - if (incomingSourceRef.contains("start")) { -// paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode()); - } - updateFlowFiled(paramMap); - return resultBean; - } - - /** - * 订金终止流程 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean stopDeposit(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); - String userSid = appBusMainDepositFlowTask.getUserSid(); - String businessSid = appBusMainDepositFlowTask.getBusinessSid(); - fl.setTaskId(appBusMainDepositFlowTask.getTaskId()); - fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId()); - fl.setComment(appBusMainDepositFlowTask.getComment()); - fl.setUserSid(userSid); - ResultBean resultBean = flowTaskFeign.breakProcess(fl); - if (!resultBean.getSuccess()) { - return resultBean; - } - Map paramMap = new HashMap<>(); - paramMap.put("sid", businessSid); - paramMap.put("nodeState", String.valueOf(resultBean.getData())); - paramMap.put("taskDefKey", "Event_end"); -// paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode()); - updateFlowFiled(paramMap); - return resultBean; - } - /** * 更新流程相关的状态 * @@ -1439,195 +1011,6 @@ public class BusMainDepositService extends MybatisBaseService variables = new HashMap<>(); - variables.put("taskId", dto.getTaskId()); - variables.put("procInsId", dto.getProcInsId()); - variables.put("businessSid", businessSid); - variables.put("userSid", dto.getUserSid()); - BusinessVariables bv = BusinessVariables.builder().build(); - bv.setFormVariables(variables); - ResultBean resultBean = flowTaskFeign.businessComplete(bv); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = ""; - String taskDefKey = ""; - Map paramMap = new HashMap<>(); - paramMap.put("sid", variables.get("businessSid").toString()); - if (resultBean.getData() != null) { - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); - if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) { - nodeState = listResultBean.getData().get(0).getName_(); - taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); - } else { - nodeState = ProcessStateEnum.FINISHED.getStateName(); - taskDefKey = "Event_end"; -// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); - } - } - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - updateFlowFiled(paramMap); - return resultBean; - } - - /** - * 预定车辆同意办理 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean agreeReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - - Map variables = new HashMap<>(); - variables.put("taskId", appBusMainDepositFlowTask.getTaskId()); - variables.put("procInsId", appBusMainDepositFlowTask.getProcInsId()); - variables.put("comment", appBusMainDepositFlowTask.getComment()); - variables.put("businessSid", appBusMainDepositFlowTask.getBusinessSid()); - variables.put("userSid", appBusMainDepositFlowTask.getUserSid()); - BusinessVariables bv = BusinessVariables.builder().build(); - bv.setFormVariables(variables); - ResultBean resultBean = flowTaskFeign.businessComplete(bv); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = ""; - String taskDefKey = ""; - Map paramMap = new HashMap<>(); - paramMap.put("sid", variables.get("businessSid").toString()); - if (resultBean.getData() != null) { - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(resultBean.getData().getProcInsId()); - if (listResultBean.getSuccess() && listResultBean.getData() != null && listResultBean.getData().size() != 0) { - nodeState = listResultBean.getData().get(0).getName_(); - taskDefKey = listResultBean.getData().get(0).getTask_def_key_(); - } else { - nodeState = ProcessStateEnum.FINISHED.getStateName(); - taskDefKey = "Event_end"; -// paramMap.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); - } - } - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - updateFlowFiled(paramMap); - return resultBean; - - } - - /** - * 预定车辆撤回流程 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean stopReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - - com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); - String userSid = appBusMainDepositFlowTask.getUserSid(); - String businessSid = appBusMainDepositFlowTask.getBusinessSid(); - fl.setTaskId(appBusMainDepositFlowTask.getTaskId()); - fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId()); - fl.setComment(appBusMainDepositFlowTask.getComment()); - fl.setUserSid(userSid); - ResultBean> resultBean = flowTaskFeign.revokeProcess(fl); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = resultBean.getData().get(0).getName_(); - String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); - String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); - Map paramMap = new HashMap<>(); - paramMap.put("sid", businessSid); - if (incomingSourceRef.contains("start")) { -// paramMap.put("nodeState", SysFormLinkFlowStateEnum.UNCOMMITTED.getState()); - paramMap.put("taskDefKey", taskDefKey); -// paramMap.put("flowState", SysFormLinkFlowStateEnum.UNCOMMITTED.getCode()); - } else { - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - } - updateFlowFiled(paramMap); - return resultBean; - - } - - /** - * 预定车辆驳回任务 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean rejectReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - - com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); - String userSid = appBusMainDepositFlowTask.getUserSid(); - String businessSid = appBusMainDepositFlowTask.getBusinessSid(); - fl.setTaskId(appBusMainDepositFlowTask.getTaskId()); - fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId()); - fl.setComment(appBusMainDepositFlowTask.getComment()); - fl.setUserSid(userSid); - ResultBean> resultBean = flowTaskFeign.taskReject(fl); - if (!resultBean.getSuccess()) { - return resultBean; - } - String nodeState = resultBean.getData().get(0).getName_(); - String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); - String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); - Map paramMap = new HashMap<>(); - paramMap.put("sid", businessSid); - paramMap.put("nodeState", nodeState); - paramMap.put("taskDefKey", taskDefKey); - if (incomingSourceRef.contains("start")) { -// paramMap.put("flowState", SysFormLinkFlowStateEnum.REJECT.getCode()); - } - updateFlowFiled(paramMap); - return resultBean; - - } - - /** - * 预定车辆终止任务 - * - * @param appBusMainDepositFlowTask - * @return - */ - public ResultBean recallReserveCar(AppBusMainDepositFlowTask appBusMainDepositFlowTask) { - - com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); - String userSid = appBusMainDepositFlowTask.getUserSid(); - String businessSid = appBusMainDepositFlowTask.getBusinessSid(); - fl.setTaskId(appBusMainDepositFlowTask.getTaskId()); - fl.setInstanceId(appBusMainDepositFlowTask.getProcInsId()); - fl.setComment(appBusMainDepositFlowTask.getComment()); - fl.setUserSid(userSid); - ResultBean resultBean = flowTaskFeign.breakProcess(fl); - if (!resultBean.getSuccess()) { - return resultBean; - } - Map paramMap = new HashMap<>(); - paramMap.put("sid", businessSid); - paramMap.put("nodeState", String.valueOf(resultBean.getData())); - paramMap.put("taskDefKey", "Event_end"); -// paramMap.put("flowState", SysFormLinkFlowStateEnum.BREAK.getCode()); - updateFlowFiled(paramMap); - return resultBean; - - } /** * 销售订单-虚拟订单分页列表 @@ -1716,8 +1099,6 @@ public class BusMainDepositService extends MybatisBaseService> stringList = finCollectionConfirmationFeign.billeNoList(); @@ -1780,7 +1161,6 @@ public class BusMainDepositService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -1843,36 +1223,12 @@ public class BusMainDepositService extends MybatisBaseService> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid); - UserRoleQuery userRoleQuery = new UserRoleQuery(); - if (userRoleList.getData().size() > 0) { - userRoleQuery.setRoleSid(userRoleList.getData().get(0)); - } - userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid()); - ResultBean> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery); - if (!listResultBean.getSuccess()) { - return rb.setMsg(listResultBean.getMsg()); - } - List sysUserVos = listResultBean.getData(); - sysUserVos.removeAll(Collections.singleton(null)); - if (sysUserVos.isEmpty()) { - return rb.setMsg("下一环节没有用户"); - } - StringBuilder nextNodeUserSids = new StringBuilder(); - for (SysUserVo su : sysUserVos) { - nextNodeUserSids.append(su.getSid()).append(","); - } - //符合条件的用户的sid,拼接的字符串 - String nextNodeUserSids_ = nextNodeUserSids.toString(); - bv.setNextNodeUserSids(nextNodeUserSids_);*/ List orgPathList = Arrays.asList(orgSidPath.split("/")); - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); - if(sysOrganization == null){ + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + if (sysOrganization == null) { return rb.setMsg("当前所在的组织机构不存在"); } - if(StringUtils.isBlank(sysOrganization.getManagerSid())){ + if (StringUtils.isBlank(sysOrganization.getManagerSid())) { return rb.setMsg("当前所在的组织机构未设置主管人员"); } String nextNodeUserSids_ = sysOrganization.getManagerSid(); @@ -1951,9 +1307,9 @@ public class BusMainDepositService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -2020,36 +1376,12 @@ public class BusMainDepositService extends MybatisBaseService> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid); - UserRoleQuery userRoleQuery = new UserRoleQuery(); - if (userRoleList.getData().size() > 0) { - userRoleQuery.setRoleSid(userRoleList.getData().get(0)); - } - userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid()); - ResultBean> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery); - if (!listResultBean.getSuccess()) { - return rb.setMsg(listResultBean.getMsg()); - } - List sysUserVos = listResultBean.getData(); - sysUserVos.removeAll(Collections.singleton(null)); - if (sysUserVos.isEmpty()) { - return rb.setMsg("下一环节没有用户"); - } - StringBuilder nextNodeUserSids = new StringBuilder(); - for (SysUserVo su : sysUserVos) { - nextNodeUserSids.append(su.getSid()).append(","); - } - //符合条件的用户的sid,拼接的字符串 - String nextNodeUserSids_ = nextNodeUserSids.toString(); - bv.setNextNodeUserSids(nextNodeUserSids_);*/ List orgPathList = Arrays.asList(orgSidPath.split("/")); - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData(); - if(sysOrganization == null){ + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + if (sysOrganization == null) { return rb.setMsg("当前所在的组织机构不存在"); } - if(StringUtils.isBlank(sysOrganization.getManagerSid())){ + if (StringUtils.isBlank(sysOrganization.getManagerSid())) { return rb.setMsg("当前所在的组织机构未设置主管人员"); } String nextNodeUserSids_ = sysOrganization.getManagerSid(); @@ -2344,7 +1676,6 @@ public class BusMainDepositService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); -// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { if ("销售专员申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { @@ -2358,7 +1689,6 @@ public class BusMainDepositService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); -// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) { if ("销售专员申请".equals(nextName)) { //更新已选择的车架号的状态为未锁定 AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); @@ -2404,7 +1734,6 @@ public class BusMainDepositService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { -// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) { if ("销售专员申请".equals(nextName)) { //更新已选择的车架号的状态为未锁定 AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 12257bfffb..32ed6f3704 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -42,7 +42,7 @@ import javax.validation.Valid; import java.util.List; /** - * Project: anrui-fin(销售相关)
+ * Project: anrui-fin(款项申请)
* File: FinCollectionConfirmationFeign.java
* Class: com.yxt.anrui.fin.api.fincollectionconfirmation.finCollectionConfirmationFeign
* Description: 收款确认表.
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index c604d1bd75..43d0d3e1b4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * Project: anrui-fin(销售相关)
+ * Project: anrui-fin(应收未收款项明细表)
* File: FinUncollectedReceivablesDetailedFeign.java
* Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign
* Description: 应收未收款项明细表.