From ee99264e5fc21611108269530946e6a2ab03da25 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 29 Sep 2022 17:16:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemiddleman/BaseMiddlemanFeign.java | 2 +- .../BaseVehicleOutDetailsVo.java | 61 +++++++++++++++++++ .../basevehicleout/BaseVehicleOutFeign.java | 11 +++- .../api/basevehicleout/BaseVehicleOutVo.java | 3 + .../BusVehicleApplyDetail.java | 3 + .../BusVehicleApplyDetailDto.java | 2 + .../BusVehicleApplyDetailVo.java | 2 + .../basevehicleout/BaseVehicleOutMapper.java | 3 + .../basevehicleout/BaseVehicleOutMapper.xml | 32 +++++++++- .../basevehicleout/BaseVehicleOutRest.java | 10 +-- .../basevehicleout/BaseVehicleOutService.java | 11 ++-- 11 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java index f0fdc138f8..e891e03891 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java @@ -89,7 +89,7 @@ public interface BaseMiddlemanFeign { ResultBean> getMiddleList(@Valid @RequestBody PagerQuery query); @ApiOperation("车辆出库中介人员") - @PostMapping("/selectMiddleList") + @GetMapping("/selectMiddleList") @ResponseBody ResultBean> selectMiddleList(@SpringQueryMap BaseMiddleListQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java new file mode 100644 index 0000000000..f68c39411b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java @@ -0,0 +1,61 @@ +package com.yxt.anrui.base.api.basevehicleout; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/29 16:45 + * @Description + */ +@Data +public class BaseVehicleOutDetailsVo implements Vo { + private static final long serialVersionUID = -7699189616162991308L; + + private String vinSid; + private String vinNo; + @ApiModelProperty("出库类型") + private String type; + private String typeKey; + @ApiModelProperty("销售部门sid") + private String orgSid; + @ApiModelProperty("销售部门名称") + private String orgName; + @ApiModelProperty("销售专员sid") + private String staffSid; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("合同编号") + private String concatNo; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("是否为终端客户:1是0不是") + private String isTerminal; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("赠品说明") + private String giftsDescription; + + @ApiModelProperty("销售折让") + private String salesAllowance; + @ApiModelProperty("中介人1") + private String middleOne; + @ApiModelProperty("中介人1sid") + private String middleOneSid; + @ApiModelProperty("返利金额1") + private String rebateMoneyOne; + @ApiModelProperty("中介人2") + private String middleTwo; + @ApiModelProperty("中介人2sid") + private String middleTwoSid; + @ApiModelProperty("返利金额2") + private String rebateMoneyTwo; + @ApiModelProperty("备注") + private String remarks; + private String saleDate; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index e1aff860e3..2198a2266a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -5,9 +5,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe @@ -30,6 +28,13 @@ public interface BaseVehicleOutFeign { @PostMapping("/pagerList") @ResponseBody ResultBean> pagerList(@RequestBody PagerQuery query); + + @ApiOperation("出库详情") + @GetMapping("/details/{sid}") + @ResponseBody + ResultBean details(@PathVariable("sid") String sid); + + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index 588f946f93..4f1253e432 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -13,6 +13,9 @@ import lombok.Data; public class BaseVehicleOutVo implements Vo { private static final long serialVersionUID = -1711615769602118459L; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("车架号") private String vinSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java index 28977d56bc..c9f880a127 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java @@ -47,4 +47,7 @@ public class BusVehicleApplyDetail extends BaseEntity { private String insideCode; @ApiModelProperty(value = "厂家合同价") private Integer contractPrice; + + @ApiModelProperty("厂家销售通路") + private String actualPay; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java index eda3859918..49506a1092 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java @@ -52,4 +52,6 @@ public class BusVehicleApplyDetailDto implements Dto { private String contractPrice; private BusVehicleApplySzDto busVehicleApplySz; + @ApiModelProperty("厂家销售通路") + private String actualPay; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java index 3815496a7e..67f83d51f5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java @@ -55,4 +55,6 @@ public class BusVehicleApplyDetailVo implements Vo { @ApiModelProperty(value = "上装指导价") private Integer guidePrice; + @ApiModelProperty("厂家销售通路") + private String actualPay; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index 382fe7ad9a..7ac5ab7c4d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface BaseVehicleOutMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + BaseVehicleOutDetailsVo details(String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 57636e87d2..642e706a88 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -42,10 +42,40 @@ bvo.middleOne, bvo.middleTwo, bvo.rebateMoneyOne, - bvo.rebateMoneyTwo + bvo.rebateMoneyTwo, + bv.configName as modelConfig, + bvo.sid from base_vehicle_out bvo + left join base_vehicle bv on bv.sid = bvo.vinSid ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index 157475632e..8afc9e4c9c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.base.biz.basevehicleout; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleout.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -36,4 +33,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { PagerVo pv = baseVehicleOutService.pagerList(query); return rb.success().setData(pv); } + + @Override + public ResultBean details(String sid) { + return baseVehicleOutService.details(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 6ee0246721..80334eb196 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleout.*; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.common.base.service.MybatisBaseService; @@ -99,4 +96,10 @@ public class BaseVehicleOutService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseMapper.details(sid); + return rb.success().setData(baseVehicleOutDetailsVo); + } } From ed4e2066ebc7919892ec7fc939fd633450f80746 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 29 Sep 2022 18:03:21 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E9=A2=84=E6=8F=90=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E6=B5=8B=E8=AF=95=E6=96=87=E6=A1=A3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/BaseVehicle.java | 9 + .../base/api/basevehicle/BaseVehicleDto.java | 8 + .../api/basevehicle/BaseVehicleFeign.java | 11 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../api/basevehicle/BaseVehicleSelectVo.java | 8 + .../base/api/basevehicle/BaseVehicleVo.java | 8 + .../biz/basevehicle/BaseVehicleMapper.java | 4 + .../base/biz/basevehicle/BaseVehicleRest.java | 5 + .../biz/basevehicle/BaseVehicleService.java | 12 +- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 + .../ScmApplyInboundVehicle.java | 3 + .../ScmApplyInboundVehicleDto.java | 3 + .../ScmApplyInboundVehicleVo.java | 3 + .../ScmCollectionRebateFeign.java | 17 + .../ScmCollectionRebateFeignFallback.java | 15 + .../ScmCollectionRebateQuery.java | 22 +- .../ScmCollectionRebateVo.java | 14 +- .../ScmCollectionRebateWithApplyDto.java | 2 + .../ScmCollectionRebateWithApplyFeign.java | 43 ++ ...ollectionRebateWithApplyFeignFallback.java | 45 ++ .../flow/GetNodeQuery.java | 25 + .../flow/GetNodeVo.java | 25 + ...mCollectionRebateWithApplyCompleteDto.java | 42 ++ ...ScmCollectionRebateWithApplyTaskQuery.java | 56 ++ ...SubmitScmCollectionRebateWithApplyDto.java | 22 + .../ScmVehInventorymonthVo.java | 2 +- .../ScmCollectionRebateMapper.java | 7 + .../ScmCollectionRebateRest.java | 25 +- .../ScmCollectionRebateService.java | 113 +++- .../ScmCollectionRebateWithMapper.java | 3 + .../ScmCollectionRebateWithService.java | 4 + .../ScmCollectionRebateWithApplyMapper.java | 3 + .../ScmCollectionRebateWithApplyMapper.xml | 15 + .../ScmCollectionRebateWithApplyRest.java | 51 ++ .../ScmCollectionRebateWithApplyService.java | 509 +++++++++++++----- .../ScmVehInventorymonthService.java | 2 +- 36 files changed, 995 insertions(+), 148 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index e260fd4874..28f68ca407 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -140,4 +140,13 @@ public class BaseVehicle extends BaseEntity { private String witPinStateValue; @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）") private String isProblemVeh; + @ApiModelProperty(value = "采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty(value = "采购系统名称") + private String purchaseSystemName; + @ApiModelProperty(value = "厂家销售通路sid") + private String manufSaleAccessSid; + @ApiModelProperty(value = "厂家销售通路名称") + private String manufSaleAccessName; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 44e77c77fa..9b205afa71 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -106,4 +106,12 @@ public class BaseVehicleDto implements Dto { private String witPinStateValue; @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）") private String isProblemVeh; + @ApiModelProperty(value = "采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty(value = "采购系统名称") + private String purchaseSystemName; + @ApiModelProperty(value = "厂家销售通路sid") + private String manufSaleAccessSid; + @ApiModelProperty(value = "厂家销售通路名称") + private String manufSaleAccessName; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 71bddc72d3..3bb82628a3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -166,6 +166,17 @@ public interface BaseVehicleFeign { @ResponseBody @ApiOperation(value = "导入") public ResultBean getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException; + + + /** + * 修改保存 + * + * @param sid 车辆sid + * @return + */ + @ApiOperation("修改车辆台账备注") + @PostMapping("/updateVehRemarks/{remarks}/{sid}") + public ResultBean updateVehRemarks(@PathVariable("remarks") String remarks, @PathVariable("sid") String sid); /***************************************************** PC现车接口 **********************************************************/ /** diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 176442b218..f5ec3ad9e9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -98,6 +98,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean updateVehRemarks(String remarks, String sid) { + return null; + } + @Override public ResultBean> exiCarPagerList(PagerQuery pq) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java index f43c6d442d..999140d48f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java @@ -95,4 +95,12 @@ public class BaseVehicleSelectVo implements Vo { private String useOrgName; @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）") private String isProblemVeh; + @ApiModelProperty(value = "采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty(value = "采购系统名称") + private String purchaseSystemName; + @ApiModelProperty(value = "厂家销售通路sid") + private String manufSaleAccessSid; + @ApiModelProperty(value = "厂家销售通路名称") + private String manufSaleAccessName; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index 8704f5c822..767a2ea9c1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -106,6 +106,14 @@ public class BaseVehicleVo implements Vo { private Long libraryAge; @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）") private String isProblemVeh; + @ApiModelProperty(value = "采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty(value = "采购系统名称") + private String purchaseSystemName; + @ApiModelProperty(value = "厂家销售通路sid") + private String manufSaleAccessSid; + @ApiModelProperty(value = "厂家销售通路名称") + private String manufSaleAccessName; //车型配置 @ApiModelProperty("车身颜色(陕汽必须的字段)") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index b6d4eed199..9e7ceeb329 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -460,4 +461,7 @@ public interface BaseVehicleMapper extends BaseMapper { IPage saleOrderVin(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + + @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}") + ResultBean updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 8f1016587f..83c059b4e6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -420,6 +420,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { } } + @Override + public ResultBean updateVehRemarks(String remarks, String sid) { + return baseVehicleService.updateVehRemarks(remarks,sid); + } + /** * pc端现车分页列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 5b100b6133..0b894d1c1c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2102,10 +2102,10 @@ public class BaseVehicleService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean updateVehRemarks(String remarks, String sid) { + return baseMapper.updateVehRemarks(remarks,sid); + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index b15a784f1f..e039930ac5 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -37,6 +37,8 @@ public enum ProcDefEnum { SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"), SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"), SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请","process_h3w1aval:1:615004"), + SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"), + SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"), CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"), ; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java index 6b66c7c0a2..f2c19e9b57 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java @@ -33,4 +33,7 @@ public class ScmApplyInboundVehicle extends BaseEntity { @ApiModelProperty("车架号(VIN)") private String vinNo; + + @ApiModelProperty("发动机号") + private String engineNo; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java index 2990c9cbd4..54a7026f04 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java @@ -38,6 +38,9 @@ public class ScmApplyInboundVehicleDto implements Dto { @ApiModelProperty("车架号(VIN)") private String vinNo; + @ApiModelProperty("发动机号") + private String engineNo; + @ApiModelProperty("备注") private String remarks; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java index 8d360546a4..a8f45ce2de 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java @@ -36,6 +36,9 @@ public class ScmApplyInboundVehicleVo implements Vo { @ApiModelProperty("车架号(VIN)") private String vinNo; + @ApiModelProperty("发动机号") + private String engineNo; + @ApiModelProperty("备注") private String remarks; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java index 6db8157bf0..536c7995d7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java @@ -75,4 +75,21 @@ public interface ScmCollectionRebateFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("回款返利未预提申请选择回款返利信息") + @PostMapping("/withApplyGetCollectionRebate") + @ResponseBody + public ResultBean> withApplyGetCollectionRebate(@RequestBody PagerQuery pq); + + @ApiOperation("回款返利核对申请选择待核对回款返利信息") + @PostMapping("/checkApplyGetCollectionRebate") + @ResponseBody + public ResultBean> checkApplyGetCollectionRebate(@RequestBody PagerQuery pq); + + @ApiOperation("回款返利核对申请选择已上传回款返利信息") + @PostMapping("/checkApplyGetAlreadyUploadCollectionRebate") + @ResponseBody + public ResultBean> checkApplyGetAlreadyUploadCollectionRebate(@RequestBody PagerQuery pq); + + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java index 0b28c726a6..1f0d4752d1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java @@ -69,4 +69,19 @@ public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeig ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmcollectionrebate/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> withApplyGetCollectionRebate(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> checkApplyGetCollectionRebate(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery pq) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java index 0b1e52672a..5767a216dc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionRebateQuery.java
@@ -51,13 +53,19 @@ public class ScmCollectionRebateQuery implements Query { @ApiModelProperty("回款方式key") private String collectionTypeKey; // 回款方式key - @ApiModelProperty("回款日期") - private String collectionDate; // 回款日期 - @ApiModelProperty(value = "创建开始日期") - private String createStartTime; - @ApiModelProperty(value = "创建结束日期") - private String createEndTime; - @ApiModelProperty("创建组织sid") + @ApiModelProperty("回款开始日期") + private String collectionStartDate; // 回款开始日期 + @ApiModelProperty("回款结束日期") + private String collectionEndDate; // 回款结束日期 + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建开始日期") + private String createStartTime; // 创建开始日期 + @ApiModelProperty("创建结束日期") + private String createEndTime; // 创建结束日期 + @ApiModelProperty("状态") + private String state; // 状态 + @ApiModelProperty("回款返利sid") + private List sidList; // 回款返利sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java index 2513f0d8e2..e9ba51f86b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java @@ -26,12 +26,15 @@ package com.yxt.anrui.scm.api.scmcollectionrebate; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionRebateVo.java
@@ -68,13 +71,17 @@ public class ScmCollectionRebateVo implements Vo { @ApiModelProperty("运费") private String freight; // 运费 @ApiModelProperty("回款日期") - private String collectionDate; // 回款日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date collectionDate; // 回款日期 @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 @ApiModelProperty("预提日期") - private String withholdingDate; // 预提日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date withholdingDate; // 预提日期 + @ApiModelProperty("预提日期(页面展示)") + private String withholdingDateCopy; // 预提日期(页面展示) @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 @ApiModelProperty("上传金额") @@ -91,5 +98,6 @@ public class ScmCollectionRebateVo implements Vo { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - + @ApiModelProperty("上传状态(2未上传、3已上传)") + private String uploadState; // 上传状态 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java index da52c75964..6699fb7bdc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java @@ -62,6 +62,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto { private String brandName; // 品牌名称 @ApiModelProperty("回款申请标题") private String collectionApply; // 回款申请标题 + @ApiModelProperty("创建人sid") + private String createBySid; // 创建人sid @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("使用组织sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java index 549723d423..1dc54a067b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java @@ -25,14 +25,22 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -75,4 +83,39 @@ public interface ScmCollectionRebateWithApplyFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + /**************************************回款返利预提审批流程*******************************************/ + + @ApiOperation("提交回款返利预提申请") + @PostMapping("/submitCollectionRebateWithApply") + public ResultBean submitCollectionRebateWithApply(@RequestBody @Valid SubmitScmCollectionRebateWithApplyDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody ScmCollectionRebateWithApplyCompleteDto dto); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "流程历史流转记录") + @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") + public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java index 2088bd3d43..2e91422f6d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java @@ -25,6 +25,11 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatewithapply; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,4 +74,44 @@ public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionR ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) { + return null; + } + + @Override + public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) { + return null; + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java new file mode 100644 index 0000000000..a0b95f7c15 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 10:42 + * @Description + */ +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -5674867230708197611L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java new file mode 100644 index 0000000000..4ae014ae7f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 11:09 + * @Description + */ +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8802774014747063504L; + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java new file mode 100644 index 0000000000..1ffedfb6e0 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 9:01 + * @Description + */ +@Data +public class ScmCollectionRebateWithApplyCompleteDto implements Dto { + private static final long serialVersionUID = 3240453987322803352L; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "参数错误：orgSidPath") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") +// @NotBlank(message = "参数错误：comment") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables = new HashMap<>(); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java new file mode 100644 index 0000000000..6ab17f7d3a --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/6/28 17:29 + * @Description 终止、撤回、驳回查询参数 + */ +@Data +public class ScmCollectionRebateWithApplyTaskQuery implements Query { + private static final long serialVersionUID = -4006020771892400451L; + /** + * 终止、驳回、撤回 + */ + @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") + private String instanceId; + /*@ApiModelProperty("用户Id") + private String userId; + @ApiModelProperty("节点") + private String targetKey; + @ApiModelProperty("流程变量信息") + private Map values = new HashMap<>(); + @ApiModelProperty("审批人") + private String assignee; + @ApiModelProperty("候选人") + private List candidateUsers = new ArrayList<>(); + @ApiModelProperty("审批组") + private List candidateGroups = new ArrayList<>();*/ +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java new file mode 100644 index 0000000000..f83ccec739 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow; + +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto; +import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/27 13:38 + * @Description + */ +@Data +public class SubmitScmCollectionRebateWithApplyDto extends ScmCollectionRebateWithApplyDto { + private static final long serialVersionUID = 378585162071125756L; + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java index 286280f908..8b8b52a908 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java @@ -54,7 +54,7 @@ public class ScmVehInventorymonthVo implements Vo { private String sid; // sid @ApiModelProperty("生成报告状态") - private String state; + private int state; @ApiModelProperty("编号（yyyyMMdd）") private String billNo; // 编号（yyyyMMdd） @ApiModelProperty("创建时间") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java index 1305622eea..94045d5eb4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -62,4 +63,10 @@ public interface ScmCollectionRebateMapper extends BaseMapper selectListVo(); + + @Update("update scm_collection_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{collectionRebateSid}") + void updateWithholdingDateBySid(String collectionRebateSid); + + @Update("update scm_collection_rebate set state = 1 where sid = #{collectionRebateSid}") + void updateState(String collectionRebateSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java index 89c5902953..f47b567c7b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java @@ -92,13 +92,13 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { for (String s : stringList) { ScmCollectionRebateWithApply scmCollectionRebateWithApply = scmCollectionRebateWithApplyService.fetchBySid(s); if (!scmCollectionRebateWithApply.getNodeState().equals("待提交")) { - return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除"); + return rb.setMsg("所选数据中包含已提交回款返利信息，无法删除"); } } ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid); Integer state = scmCollectionRebate.getState(); if (state == 1) { - return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除"); + return rb.setMsg("所选数据中包含已预提回款返利信息，无法删除"); } } scmCollectionRebateService.delBySids(sids); @@ -113,4 +113,25 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> withApplyGetCollectionRebate(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateService.withApplyGetCollectionRebate(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> checkApplyGetCollectionRebate(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateService.checkApplyGetCollectionRebate(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateService.checkApplyGetAlreadyUploadCollectionRebate(pq); + return rb.success().setData(pv); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index a0720980f4..46572d24f1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmcollectionrebate; 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 org.apache.commons.lang3.StringUtils; @@ -43,6 +44,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -74,9 +76,11 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). @@ -122,4 +126,107 @@ public class ScmCollectionRebateService extends MybatisBaseService withApplyGetCollectionRebate(PagerQuery pq) { + ScmCollectionRebateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { + qw.eq("collectionTypeKey", query.getCollectionTypeKey()); + } + String collectionStartDate = query.getCollectionStartDate(); + String collectionEndDate = query.getCollectionEndDate(); + qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.eq("state", 0); + if (query.getSidList().size() > 0) { + qw.notIn("sid", query.getSidList()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo checkApplyGetCollectionRebate(PagerQuery pq) { + ScmCollectionRebateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { + qw.eq("collectionTypeKey", query.getCollectionTypeKey()); + } + String collectionStartDate = query.getCollectionStartDate(); + String collectionEndDate = query.getCollectionEndDate(); + qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.ne("state", 0); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmCollectionRebateVo record : pagging.getRecords()) { + //上传状态：未上传 + if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) { + record.setUploadState("2"); + } + //上传状态：已上传 + if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) { + record.setUploadState("3"); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo checkApplyGetAlreadyUploadCollectionRebate(PagerQuery pq) { + ScmCollectionRebateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { + qw.eq("collectionTypeKey", query.getCollectionTypeKey()); + } + String collectionStartDate = query.getCollectionStartDate(); + String collectionEndDate = query.getCollectionEndDate(); + qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.eq("state", 3); + if (query.getSidList().size() > 0) { + qw.notIn("sid", query.getSidList()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (ScmCollectionRebateVo record : pagging.getRecords()) { + Date withholdingDate = record.getWithholdingDate(); + int year = DateUtil.year(withholdingDate); + int month = DateUtil.month(withholdingDate) + 1; + String withholdingDateCopy = year + "年" + month + "月"; + record.setWithholdingDateCopy(withholdingDateCopy); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java index 378c4bcf8c..cec421dd78 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java @@ -72,4 +72,7 @@ public interface ScmCollectionRebateWithMapper extends BaseMapper fetchByMainSid(String sid); + + @Select("select collectionRebateSid from scm_collection_rebate_with where mainSid = #{businessSid}") + List fetchCollectionReBateSidByMainSid(String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java index f6ba498b97..9dfb98e5ce 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java @@ -119,4 +119,8 @@ public class ScmCollectionRebateWithService extends MybatisBaseService fetchByMainSid(String sid) { return baseMapper.fetchByMainSid(sid); } + + public List fetchCollectionReBateSidByMainSid(String businessSid) { + return baseMapper.fetchCollectionReBateSidByMainSid(businessSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java index 0a2371cfb2..6909f1dfd7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java @@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; import java.util.List; +import java.util.Map; /** * Project: anrui-scm(回款返利)
@@ -64,4 +65,6 @@ public interface ScmCollectionRebateWithApplyMapper extends BaseMapper selectListVo(); int selectBySid(String join); + + int updateFlowFiled(Map beanToMap); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml index 0b89e8ae89..8cf6fa8a2c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml @@ -28,4 +28,19 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + + UPDATE scm_collection_rebate_with_apply + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java index d77ed982a6..3ed229fb3b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java @@ -25,6 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -91,4 +99,47 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid); } + + @Override + public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) { + return scmCollectionRebateWithApplyService.submitCollectionRebateWithApply(dto); + } + + @Override + public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId()); + return scmCollectionRebateWithApplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmCollectionRebateWithApplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmCollectionRebateWithApplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmCollectionRebateWithApplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmCollectionRebateWithApplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmCollectionRebateWithApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmCollectionRebateWithApplyService.getPreviousNodesForReject(query); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java index e466dda661..6baafd4fd3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java @@ -26,11 +26,26 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +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.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto; +import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService; import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -48,8 +63,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui-scm(回款返利)
@@ -67,131 +82,371 @@ import java.util.List; @Service public class ScmCollectionRebateWithApplyService extends MybatisBaseService { - @Autowired - private ScmCollectionRebateWithService scmCollectionRebateWithService; - - private QueryWrapper createQueryWrapper(ScmCollectionRebateWithApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmCollectionRebateWithApplyQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("scrwa.brandSid", query.getBrandSid()); - } - if (StringUtils.isNotBlank(query.getCollectionApply())) { - qw.like("scrwa.withApply", query.getCollectionApply()); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - qw.eq("scrwa.createOrgSid", query.getCreateOrgSid()); - qw.groupBy("scrwa.sid"); - qw.orderByDesc("scrwa.createTime"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - String dtoSid = dto.getSid(); - List scmCollectionRebateWiths = dto.getScmCollectionRebateWiths(); - if (scmCollectionRebateWiths == null) { - return rb.setMsg("请选择回款返利信息"); - } - if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto).getData(); - for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) { - List collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids(); - for (String collectionRebateSid : collectionRebateSids) { - ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith(); - scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid); - scmCollectionRebateWith.setMainSid(sid); - scmCollectionRebateWithService.save(scmCollectionRebateWith); - } - } - return rb.success().setMsg("添加成功").setData(sid); - } - ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid); - if (scmCollectionRebateWithApply == null) { - rb.setMsg("该回款返利预提申请单不存在"); - } - this.updateByDto(dto); - scmCollectionRebateWithService.delByMainSid(dtoSid); - for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) { - List collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids(); - for (String collectionRebateSid : collectionRebateSids) { - ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith(); - scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid); - scmCollectionRebateWith.setMainSid(dtoSid); - scmCollectionRebateWithService.save(scmCollectionRebateWith); - } - } - return rb.success().setMsg("修改成功").setData(dtoSid); - } - - public ResultBean insertByDto(ScmCollectionRebateWithApplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setNodeState("待提交"); - baseMapper.insert(entity); - return rb.success().setData(entity.getSid()); - } - - public void updateByDto(ScmCollectionRebateWithApplyDto dto){ - String dtoSid = dto.getSid(); + @Autowired + private ScmCollectionRebateWithService scmCollectionRebateWithService; + @Autowired + private ScmCollectionRebateService scmCollectionRebateService; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private FlowableFeign flowableFeign; + @Autowired + private FlowTaskFeign flowTaskFeign; + @Autowired + private SysUserFeign sysUserFeign; + + private QueryWrapper createQueryWrapper(ScmCollectionRebateWithApplyQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateWithApplyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("scrwa.brandSid", query.getBrandSid()); + } + if (StringUtils.isNotBlank(query.getCollectionApply())) { + qw.like("scrwa.withApply", query.getCollectionApply()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("scrwa.createOrgSid", query.getCreateOrgSid()); + qw.groupBy("scrwa.sid"); + qw.orderByDesc("scrwa.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List scmCollectionRebateWiths = dto.getScmCollectionRebateWiths(); + if (scmCollectionRebateWiths == null) { + return rb.setMsg("请选择回款返利信息"); + } + if (StringUtils.isBlank(dtoSid)) { + String sid = this.insertByDto(dto).getData(); + for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) { + List collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids(); + for (String collectionRebateSid : collectionRebateSids) { + ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith(); + scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid); + scmCollectionRebateWith.setMainSid(sid); + scmCollectionRebateWithService.save(scmCollectionRebateWith); + } + } + return rb.success().setMsg("添加成功").setData(sid); + } + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid); + if (scmCollectionRebateWithApply == null) { + rb.setMsg("该回款返利预提申请单不存在"); + } + this.updateByDto(dto); + scmCollectionRebateWithService.delByMainSid(dtoSid); + for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) { + List collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids(); + for (String collectionRebateSid : collectionRebateSids) { + ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith(); + scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid); + scmCollectionRebateWith.setMainSid(dtoSid); + scmCollectionRebateWithService.save(scmCollectionRebateWith); + } + } + return rb.success().setMsg("修改成功").setData(dtoSid); + } + + public ResultBean insertByDto(ScmCollectionRebateWithApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + baseMapper.insert(entity); + return rb.success().setData(entity.getSid()); + } + + public void updateByDto(ScmCollectionRebateWithApplyDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmCollectionRebateWithApply entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid){ - ScmCollectionRebateWithApply entity = fetchBySid(sid); - ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public ResultBean delAll(String[] sids) { - ResultBean rb = ResultBean.fireFail(); - //查询该sid中是否有流程不是待提交的 - int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); - if (count > 0) { - return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); - } - delBySids(sids); - for (String sid : sids) { - scmCollectionRebateWithService.delByMainSid(sid); - } - return rb.success().setMsg("删除成功"); - } - - public ResultBean fetchAllDetailsVo(String sid) { - ResultBean rb = ResultBean.fireFail(); - ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo(); - ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid); - BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo); - List scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid); - for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) { - String[] specialRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(","); - scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(specialRebateSids)); - String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate(); - withRebate = withRebate.substring(0, withRebate.lastIndexOf(".")); - scmCollectionRebateWithDetailsVo.setWithRebate(withRebate); - } - scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos); - return rb.success().setData(scmCollectionRebateWithApplyDetailsVo); - } + } + ScmCollectionRebateWithApply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid) { + ScmCollectionRebateWithApply entity = fetchBySid(sid); + ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); + } + delBySids(sids); + for (String sid : sids) { + scmCollectionRebateWithService.delByMainSid(sid); + } + return rb.success().setMsg("删除成功"); + } + + public ResultBean fetchAllDetailsVo(String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo(); + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid); + BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo); + List scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid); + for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) { + String[] collectionRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(","); + scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(collectionRebateSids)); + String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate(); + withRebate = withRebate.substring(0, withRebate.lastIndexOf(".")); + scmCollectionRebateWithDetailsVo.setWithRebate(withRebate); + } + scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos); + return rb.success().setData(scmCollectionRebateWithApplyDetailsVo); + } + + public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, scmCollectionRebateWithApply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + ResultBean resultBean = saveOrUpdateDto(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值 + Map variables = BeanUtil.beanToMap(dto); + //若有网关，则赋值网关中判断的字段。 + variables.put("businessSid", businessSid); + //=====================添加app所需参数 + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getCreateBySid()); + bv.setFormVariables(variables); + //流程定义id + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId()); + //获取回款返利sid + List scmCollectionRebateWiths = dto.getScmCollectionRebateWiths(); + for (ScmCollectionRebateWithDto scmCollectionRebateWith : scmCollectionRebateWiths) { + List collectionRebateSids = scmCollectionRebateWith.getCollectionRebateSids(); + for (String collectionRebateSid : collectionRebateSids) { + scmCollectionRebateService.updateWithholdingDateBySid(collectionRebateSid); + } + } + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(scmCollectionRebateWithApply.getTaskId()); + bv.setTaskDefKey(scmCollectionRebateWithApply.getNodeSid()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitBusinessData(SubmitScmCollectionRebateWithApplyDto dto, ScmCollectionRebateWithApply scmCollectionRebateWithApply) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (scmCollectionRebateWithApply != null) { + String businessTaskId = scmCollectionRebateWithApply.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + + } + return r; + } + + private int updateFlowFiled(Map beanToMap) { + return baseMapper.updateFlowFiled(beanToMap); + } + + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid()); + List collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid()); + if (bv.getTaskId().equals(scmCollectionRebateWithApply.getTaskId())) { + ResultBean resultBean = flowableFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + for (String collectionRebateSid : collectionRebateSids) { + scmCollectionRebateService.updateState(collectionRebateSid); + } + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + + public ResultBean revokeProcess(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + //根据业务sid查询排内购申请 + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = scmCollectionRebateWithApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + flowTaskVo.setValues(BeanUtil.beanToMap(scmCollectionRebateWithApply)); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } + + public ResultBean taskReject(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid()); + if (scmCollectionRebateWithApply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = scmCollectionRebateWithApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean breakProcess(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid()); + String businessTaskId = scmCollectionRebateWithApply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean flowRecord(String procInsId) { + return flowTaskFeign.businessFlowRecord(procInsId); + } + + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java index c1027d1afc..28e5e82023 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java @@ -123,7 +123,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService Date: Thu, 29 Sep 2022 18:04:34 +0800 Subject: [PATCH 3/8] =?UTF-8?q?flowable:=20database-schema-update:=20?= =?UTF-8?q?=EF=BC=88=E6=9B=B4=E6=94=B9=E4=B8=BAfalse=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-flowable-biz/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml b/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml index 42fdaed56c..10eae4a793 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml +++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml @@ -45,7 +45,7 @@ logging: flowable: - database-schema-update: true + database-schema-update: flase common: app: idm-url: http://localhost:7001/flowable-idm From 69fd3e1b9c85a9ec3a95711cbff8c5b9ff68d553 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Thu, 29 Sep 2022 20:47:26 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysmapping/SysMappingFeign.java | 5 ++ .../sysmapping/SysMappingFeignFallback.java | 5 ++ .../biz/sysmapping/SysMappingMapper.java | 6 ++ .../biz/sysmapping/SysMappingMapper.xml | 11 ++++ .../portal/biz/sysmapping/SysMappingRest.java | 7 +++ .../biz/sysmapping/SysMappingService.java | 17 +++-- ...ScmVehiclePatrolinspectionsheetInfoVo.java | 5 ++ .../ScmVehicleInventoryMapper.xml | 8 +-- .../ScmVehiclePatrolinspectionMapper.java | 2 +- .../ScmVehiclePatrolinspectionService.java | 16 ++--- .../ScmVehiclePatrolinspectionsheetMapper.xml | 32 +++++----- .../ScmVehInventorymonthService.java | 6 +- .../ScmVehPatrolinspectionmonthService.java | 62 +++++++++++++++++++ 13 files changed, 145 insertions(+), 37 deletions(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java index d710445e2d..a49d26d9dd 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java @@ -85,4 +85,9 @@ public interface SysMappingFeign { @PostMapping("/selectMappingInfo") @ResponseBody public ResultBean selectMappingInfo(@RequestBody SysMappingInfoQuery query); + + @ApiOperation("回显映射") + @GetMapping("/selectMappingListInfo/{dictSid}") + @ResponseBody + public ResultBean> selectMappingListInfo(@PathVariable("dictSid") String dictSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java index 1aa609b3c8..69b4ad0a12 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java @@ -79,4 +79,9 @@ public class SysMappingFeignFallback implements SysMappingFeign { public ResultBean selectMappingInfo(SysMappingInfoQuery query) { return null; } + + @Override + public ResultBean> selectMappingListInfo(String dictSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java index 0020c83dea..0f8c0efd34 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -67,4 +68,9 @@ public interface SysMappingMapper extends BaseMapper { List selectListVo(); SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper qw); + + List selectMappingListInfo(@Param("dictSid") String dictSid); + + @Delete("delete from sys_mapping where dictSid = #{dictSid}") + void deleteByDictSid(@Param("dictSid") String dictSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml index 91f7ceda36..71dff95347 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml @@ -44,5 +44,16 @@ LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode ${ew.sqlSegment} + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java index 19db2ebc09..b71b59ae62 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java @@ -110,4 +110,11 @@ public class SysMappingRest implements SysMappingFeign { SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query); return rb.success().setData(vo); } + + @Override + public ResultBean> selectMappingListInfo(String dictSid) { + ResultBean> rb = ResultBean.fireFail(); + List vo = sysMappingService.selectMappingListInfo(dictSid); + return rb.success().setData(vo); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java index 1475ffac0a..a2735afab6 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java @@ -135,11 +135,14 @@ public class SysMappingService extends MybatisBaseService dto) { - for (SysMappingDto sysMappingDto : dto) { - SysMapping entity = new SysMapping(); - BeanUtil.copyProperties(sysMappingDto, entity); - entity.setCreateBySid(sysMappingDto.getUserSid()); - save(entity); + if (dto.size() > 0) { + baseMapper.deleteByDictSid(dto.get(0).getDictSid()); + for (SysMappingDto sysMappingDto : dto) { + SysMapping entity = new SysMapping(); + BeanUtil.copyProperties(sysMappingDto, entity); + entity.setCreateBySid(sysMappingDto.getUserSid()); + save(entity); + } } } @@ -163,4 +166,8 @@ public class SysMappingService extends MybatisBaseService selectMappingListInfo(String dictSid) { + return baseMapper.selectMappingListInfo(dictSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java index 8e42b5956e..af960ebebb 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java @@ -58,4 +58,9 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo { @ApiModelProperty("用户sid") private String userName; + @ApiModelProperty("存放地点sid") + private String warehouseSid; + + @ApiModelProperty("存放地点") + private String warehouse; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml index 14b81f7793..a1e03cf5be 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml @@ -118,11 +118,11 @@ - SELECT sid, - mainSid as recordSid, - vinNo as vin, - model, - modelSid, - situationExplain as `explain`, - problems, - results, - dutyName as liableName, - dutySid as liableSid, - location, - address, - createBySid as userSid - FROM scm_vehicle_patrolinspectionsheet - WHERE mainSid = #{recordSid} + SELECT svps.sid, + svps.mainSid as recordSid, + svps.vinNo as vin, + svps.model, + svps.modelSid, + svps.situationExplain as `explain`, + svps.problems, + svps.results, + svps.dutyName as liableName, + svps.dutySid as liableSid, + svps.location, + svps.address, + svps.createBySid as userSid + FROM scm_vehicle_patrolinspectionsheet svps + WHERE svps.mainSid = #{recordSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 7a82050560..7ec09fe7a5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -1,15 +1,10 @@ package com.yxt.anrui.base.biz.basemanufacturer; -import com.auth0.jwt.JWT; -import com.auth0.jwt.interfaces.DecodedJWT; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.*; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; -import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.utils.ExportExcelUtils; -import com.yxt.common.base.utils.JWTUtil; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -19,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -168,4 +162,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { BaseManufacturerVo vo = baseManufacturerService.queryBycertOrg(certOrg); return rb.success().setData(vo); } + + @Override + public ResultBean> selectNameByOrg(BaseManufacturerListQuery query) { + return baseManufacturerService.selectNameByOrg(query); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index a54b49bd59..8b05b69281 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -407,4 +407,12 @@ public class BaseManufacturerService extends MybatisBaseService> bankNames = baseMapper.bankNamesDown(manufacturerSid); return rb.success().setData(bankNames); } + + public ResultBean> selectNameByOrg(BaseManufacturerListQuery query) { + ResultBean> rb = ResultBean.fireFail(); + String useOrgSid = query.getUseOrgSid(); + String supplierTypeValue = "主机厂"; + List list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue); + return rb.success().setData(list); + } } \ No newline at end of file From da28dff897a45d8e49181e9e800c95eeb9984698 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 30 Sep 2022 11:40:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E5=88=86=E5=85=AC=E5=8F=B8=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sysorganization/SysOrganizationFeign.java | 5 +++++ .../SysOrganizationFeignFallback.java | 5 +++++ .../sysorganization/SysOrganizationListsVo.java | 17 +++++++++++++++++ .../sysorganization/SysOrganizationMapper.java | 1 + .../sysorganization/SysOrganizationMapper.xml | 6 ++++++ .../sysorganization/SysOrganizationRest.java | 5 +++++ .../sysorganization/SysOrganizationService.java | 12 ++++++++++++ 7 files changed, 51 insertions(+) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 879377e42e..ffd6fa92bb 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -139,4 +139,9 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("当前分公司销售部门及部门人员") ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectOrgLists") + @ResponseBody + @ApiOperation("当前分公司下所有部门") + ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index a7bd307be5..2c64662f4d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -142,4 +142,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean> selectOrgList(SysOrganizationListQuery query) { return null; } + + @Override + public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java new file mode 100644 index 0000000000..a93ab2d4d1 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/30 11:28 + * @Description + */ +@Data +public class SysOrganizationListsVo implements Vo { + private static final long serialVersionUID = -7021974833444298712L; + + private String orgDeptSid; + private String orgDeptName; +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index d10355bfe8..40a43556b5 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -106,6 +106,7 @@ public interface SysOrganizationMapper extends BaseMapper { SysOrgVo getListOrgByBrand(String sid); List selectOrgList(String orgSid); + List selectOrgLists(String orgSid); List selectByOrgDeptSid(String orgDeptSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index 9a0dd40813..b6a16a4e9b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -181,6 +181,12 @@ and orgAttributeKey = 'DP03_SYS' + +