From c66c52f7b4d138841d23cbe4bd80f711cd79dd92 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 2 Aug 2023 13:52:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 32 ++++---- .../biz/flowtask/FlowTaskService.java | 4 +- .../portal/api/flow/FlowableFallback.java | 2 +- .../anrui/portal/api/flow/FlowableFeign.java | 2 +- .../anrui/portal/biz/flow/FlowableRest.java | 13 +-- .../portal/biz/flow/FlowableService.java | 32 +++++--- .../ScmPurchaseChannel.java | 10 ++- .../ScmPurchaseChannelDto.java | 80 ++++++++++--------- .../ScmPurchaseChannelFeign.java | 6 ++ .../ScmPurchaseChannelFeignFallback.java | 5 ++ .../ScmPurchaseChannelPush.java | 51 ++++++++++++ .../ScmPurchaseChannelRest.java | 9 ++- .../ScmPurchaseChannelService.java | 30 +++++-- 13 files changed, 193 insertions(+), 83 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelPush.java 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 d64ee10a21..689e44022a 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 @@ -167,6 +167,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherp import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign; import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelDto; import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign; +import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelPush; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.DocPdfComponent; @@ -5238,24 +5239,23 @@ public class BusSalesOrderService extends MybatisBaseService processVariables = task.getProcessVariables(); flowTask.setProcessVariables(processVariables); - Map taskLocalVariables= task.getTaskLocalVariables(); - System.out.println(JSON.toJSONString(taskLocalVariables)); + /* Map taskLocalVariables= task.getTaskLocalVariables(); + System.out.println(JSON.toJSONString(taskLocalVariables));*/ // 当前流程信息 flowTask.setTaskId(task.getId()); flowTask.setTaskDefKey(task.getTaskDefinitionKey()); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java index 4efb6015cf..2984b8e59c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFallback.java @@ -79,7 +79,7 @@ public class FlowableFallback implements FlowableFeign{ } @Override - public ResultBean> todoAllTaskList(String userSid, PagerQuery pQuery) { + public ResultBean> todoAllTaskList(String userSid, PagerQuery pQuery) { return null; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java index 475565f886..8341a84dc1 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/FlowableFeign.java @@ -188,7 +188,7 @@ public interface FlowableFeign { */ @ApiOperation(value = "总待办列表") @PostMapping("/todoAllTaskList/{userSid}") - public ResultBean> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, + public ResultBean> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery pQuery); @ApiOperation(value = "业务系统查询待办任务列表数量") diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 780ab20c48..39116fe73a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -277,8 +277,8 @@ public class FlowableRest implements FlowableFeign { } @Override - public ResultBean> todoAllTaskList(String userSid, PagerQuery pQuery) {//待办列表 - SysUser sysUser = sysUserService.fetchBySid(userSid); + public ResultBean> todoAllTaskList(String userSid, PagerQuery pQuery) {//待办列表 + /* SysUser sysUser = sysUserService.fetchBySid(userSid); String staffSid = sysUser.getStaffSid(); List sysStaffOrgListByStaffSid = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid); StringBuilder sb = new StringBuilder(); @@ -289,14 +289,15 @@ public class FlowableRest implements FlowableFeign { if (sb.length() > 0) { sb.delete(sb.length() - 1, sb.length()); } - pQuery.getParams().setOrgSid(sb.toString()); - Page page = new Page<>(); + pQuery.getParams().setOrgSid(sb.toString());*/ + /* Page page = new Page<>(); BeanUtil.copyProperties(flowableService.todoAllTaskList(userSid, pQuery).getData(),page); ResultBean< Page> success = new ResultBean< Page>().success(); success.setData(page); - return success; + return success;*/ + return flowableService.todoAllTaskList(userSid, pQuery); } @Override @@ -321,7 +322,7 @@ public class FlowableRest implements FlowableFeign { @Override public ResultBean> doneAllTaskList(String userSid, PagerQuery pQuery) {//已办列表 - ResultBean> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery); + ResultBean> pageResultBean = flowableService.doneAllTaskList(userSid, pQuery); Page page = new Page<>(); BeanUtil.copyProperties(pageResultBean.getData(),page); ResultBean> success = new ResultBean>().success(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 6b716ae9f7..cb0772f03b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.flowable.api.flow.UserAndOrgPath; import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign; import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; @@ -341,8 +340,8 @@ public class FlowableService extends MybatisBaseService> todoAllTaskList(String userSid, PagerQuery pQuery) { - ResultBean> rb = new ResultBean>().fireFail(); + public ResultBean> todoAllTaskList(String userSid, PagerQuery pQuery) { + ResultBean> rb = ResultBean.fireFail(); FlowTaskAllQuery params = pQuery.getParams(); if (StringUtils.isBlank(userSid)) { return rb.setMsg("用户SID为空"); @@ -385,13 +384,13 @@ public class FlowableService extends MybatisBaseService> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg("流程错误"); + } + PagerVo page = new PagerVo<>(); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList()); + voList.removeAll(Collections.singleton(null)); + page.setRecords(voList); + page.setCurrent(resultBean.getData().getCurrent()); + page.setSize(resultBean.getData().getSize()); + page.setTotal(resultBean.getData().getTotal()); + long pages = (resultBean.getData().getTotal() + resultBean.getData().getSize() -1) / resultBean.getData().getSize(); + page.setPages(pages); + return rb.success().setData(page); } public ResultBean getTodoNum(String userSid) { @@ -421,7 +435,7 @@ public class FlowableService extends MybatisBaseService> doneAllTaskList(String userSid, PagerQuery pQuery) { - ResultBean> rb = new ResultBean>().fireFail(); + ResultBean> rb = ResultBean.fireFail(); FlowTaskAllQuery params = pQuery.getParams(); if (StringUtils.isBlank(userSid)) { return rb.setMsg("用户SID为空"); @@ -545,7 +559,7 @@ public class FlowableService extends MybatisBaseService> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery); + ResultBean> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery); if (!resultBean.getSuccess()) { return rb.setMsg("流程错误"); } @@ -671,7 +685,7 @@ public class FlowableService extends MybatisBaseService> resultBean = flowTaskFeign.businessDoneListForApp(userSid, taskQueryPagerQuery); + ResultBean> resultBean = flowTaskFeign.businessDoneListForApp(userSid, taskQueryPagerQuery); if (!resultBean.getSuccess()) { return rb.setMsg("流程错误"); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java index 78d3f79fc3..9d743e2849 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java @@ -37,8 +37,6 @@ import lombok.Data; public class ScmPurchaseChannel extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建人接口") - private String createByName; @ApiModelProperty("销售订单sid") private String saleOrderSid; @ApiModelProperty("销售订单编号") @@ -47,6 +45,8 @@ public class ScmPurchaseChannel extends BaseEntity { private String saleOrderApproDate; @ApiModelProperty("业务类型") private String businessType; + @ApiModelProperty("业务类型key") + private String businessTypeKey; @ApiModelProperty("申请部门sid") private String applyDeptSid; @ApiModelProperty("申请部门名称") @@ -73,5 +73,11 @@ public class ScmPurchaseChannel extends BaseEntity { private String purchaseOrderTypeKey; @ApiModelProperty("采购渠道value") private String purchaseOrderTypeValue; + @ApiModelProperty("操作人sid") + private String operateSid; + @ApiModelProperty("操作人") + private String operateName; + @ApiModelProperty("操作日期") + private String choiceDate; } 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 0207399fd9..862752cf04 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 @@ -37,43 +37,49 @@ import lombok.Data; public class ScmPurchaseChannelDto implements Dto { private static final long serialVersionUID = 4704549667731353652L; - private String sid; // sid + private String sid; - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - @ApiModelProperty("销售订单sid") - private String saleOrderSid; // 销售订单sid - @ApiModelProperty("销售订单编号") - private String saleOrderNo; // 销售订单编号 - @ApiModelProperty("销售订单审批日期") - private String saleOrderApproDate; // 销售订单审批日期 - @ApiModelProperty("业务类型") - private String businessType; // 业务类型 - @ApiModelProperty("申请部门sid") - private String applyDeptSid; // 申请部门sid - @ApiModelProperty("申请部门名称") - private String applyDeptName; // 申请部门名称 - @ApiModelProperty("申请人sid") - private String applyPeoSid; // 申请人sid - @ApiModelProperty("申请人姓名") - private String applyPeoName; // 申请人姓名 - @ApiModelProperty("车型sid") - private String modelSid; // 车型sid - @ApiModelProperty("车型名称") - private String modelName; // 车型名称 - @ApiModelProperty("配置sid") - private String configSid; // 配置sid - @ApiModelProperty("配置名称") - private String configName; // 配置名称 - @ApiModelProperty("数量") - private String num; // 数量 - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - @ApiModelProperty("分公司名称") - private String useOrgName; // 分公司名称 - @ApiModelProperty("采购渠道key") - private String purchaseOrderTypeKey; // 采购渠道key - @ApiModelProperty("采购渠道value") - private String purchaseOrderTypeValue; // 采购渠道value + @ApiModelProperty("用户sid") + private String userSid; + + + /* @ApiModelProperty("创建人接口") + private String createByName; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("销售订单编号") + private String saleOrderNo; + @ApiModelProperty("销售订单审批日期") + private String saleOrderApproDate; + @ApiModelProperty("业务类型") + private String businessType; + @ApiModelProperty("业务类型key") + private String businessTypeKey; + @ApiModelProperty("申请部门sid") + private String applyDeptSid; + @ApiModelProperty("申请部门名称") + private String applyDeptName; + @ApiModelProperty("申请人sid") + private String applyPeoSid; + @ApiModelProperty("申请人姓名") + private String applyPeoName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("配置名称") + private String configName; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("分公司sid") + 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 996ec79573..c469817003 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 @@ -68,4 +68,10 @@ public interface ScmPurchaseChannelFeign { @ResponseBody public ResultBean choice(@RequestBody List dto); + + @ApiOperation("销售订单推送待选择采购渠道") + @PostMapping("/push") + @ResponseBody + public ResultBean push(@RequestBody ScmPurchaseChannelPush 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 441e60f184..4e5b693df9 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 @@ -61,4 +61,9 @@ public class ScmPurchaseChannelFeignFallback implements ScmPurchaseChannelFeign public ResultBean choice(List dto) { return null; } + + @Override + public ResultBean push(ScmPurchaseChannelPush 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/ScmPurchaseChannelPush.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelPush.java new file mode 100644 index 0000000000..48c0000eff --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelPush.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.scm.api.scmpurchasechannel; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/2 + **/ +@Data +public class ScmPurchaseChannelPush implements Dto { + + private static final long serialVersionUID = 8346744643617074592L; + + @ApiModelProperty("创建人接口") + private String createByName; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("销售订单编号") + private String saleOrderNo; + @ApiModelProperty("销售订单审批日期") + private String saleOrderApproDate; + @ApiModelProperty("业务类型") + private String businessType; + @ApiModelProperty("业务类型key") + private String businessTypeKey; + @ApiModelProperty("申请部门sid") + private String applyDeptSid; + @ApiModelProperty("申请部门名称") + private String applyDeptName; + @ApiModelProperty("申请人sid") + private String applyPeoSid; + @ApiModelProperty("申请人姓名") + private String applyPeoName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("配置名称") + private String configName; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("分公司sid") + private String useOrgSid; + @ApiModelProperty("分公司名称") + private String useOrgName; +} 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 f2ecf5914d..df49b95522 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 @@ -57,9 +57,7 @@ public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign { @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody ScmPurchaseChannelDto dto) { - ResultBean rb = ResultBean.fireFail(); - scmPurchaseChannelService.saveOrUpdateDto(dto); - return rb.success(); + return scmPurchaseChannelService.saveOrUpdateDto(dto); } @Override @@ -84,4 +82,9 @@ public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign { public ResultBean choice(List dto) { return scmPurchaseChannelService.choice(dto); } + + @Override + public ResultBean push(ScmPurchaseChannelPush dto) { + return scmPurchaseChannelService.push(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 d52144066a..e1d0f12e0f 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 @@ -82,13 +82,17 @@ public class ScmPurchaseChannelService extends MybatisBaseService