From 8bb71028a27299f6315a7e96f8b789730d9f79c0 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 25 Dec 2024 09:53:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/dictcommon/DictCommonMapper.xml | 2 +- .../ScmCollectionRebateWithApply.java | 2 + ...ScmCollectionRebateWithApplyDetailsVo.java | 2 + .../ScmCollectionRebateWithApplyDto.java | 2 + .../ScmCollectionRebateWithApplyQuery.java | 6 +- .../ScmCollectionRebateWithApplyVo.java | 16 +- .../ScmSpecialRebateFeign.java | 8 +- .../scmspecialrebate/ScmSpecialRebateVo.java | 22 +-- .../ScmSpecialrebateCheckapply.java | 24 +-- .../ScmSpecialrebateCheckapplyDetailsVo.java | 26 +-- .../ScmSpecialrebateCheckapplyDto.java | 24 +-- .../ScmSpecialrebateCheckapplyFeign.java | 5 +- .../ScmSpecialrebateCheckapplyQuery.java | 22 ++- .../ScmSpecialrebateCheckapplyVo.java | 38 ++-- .../ScmSpecialrebateCheckapplydetail.java | 8 +- ...pecialrebateCheckapplydetailDetailsVo.java | 4 + .../ScmSpecialrebateCheckapplydetailDto.java | 8 +- ...ScmSpecialrebateCheckapplydetailFeign.java | 20 -- ...alrebateCheckapplydetailFeignFallback.java | 22 --- ...ScmSpecialrebateCheckapplydetailQuery.java | 57 ------ .../ScmSpecialrebateCheckapplydetailVo.java | 8 +- .../ScmSpecialRebateWithDetailsVo.java | 4 +- .../ScmSpecialRebateWithFeign.java | 20 -- .../ScmSpecialRebateWithApply.java | 24 +-- .../ScmSpecialRebateWithApplyDetailsVo.java | 24 +-- .../ScmSpecialRebateWithApplyDto.java | 24 +-- .../ScmSpecialRebateWithApplyFeign.java | 5 +- .../ScmSpecialRebateWithApplyQuery.java | 19 +- .../ScmSpecialRebateWithApplyVo.java | 24 +-- .../ScmCollectionRebateWithApplyMapper.xml | 6 +- .../ScmCollectionRebateWithApplyService.java | 3 + .../ScmSpecialrebateCheckapplyMapper.java | 6 +- .../ScmSpecialrebateCheckapplyMapper.xml | 11 ++ .../ScmSpecialrebateCheckapplyRest.java | 178 ++++++++--------- .../ScmSpecialrebateCheckapplyService.java | 28 +++ ...cmSpecialrebateCheckapplydetailMapper.java | 17 +- ...ScmSpecialrebateCheckapplydetailMapper.xml | 43 ++--- .../ScmSpecialrebateCheckapplydetailRest.java | 44 ----- ...mSpecialrebateCheckapplydetailService.java | 51 ----- .../ScmSpecialRebateWithMapper.java | 9 - .../ScmSpecialRebateWithMapper.xml | 6 - .../ScmSpecialRebateWithRest.java | 46 +---- .../ScmSpecialRebateWithService.java | 56 ------ .../ScmSpecialRebateWithApplyMapper.java | 2 + .../ScmSpecialRebateWithApplyMapper.xml | 8 + .../ScmSpecialRebateWithApplyRest.java | 180 +++++++++--------- .../ScmSpecialRebateWithApplyService.java | 23 +++ .../prePaymentApply.doc | Bin 18432 -> 36352 bytes 48 files changed, 481 insertions(+), 706 deletions(-) delete mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml index eb1aacf865..91f5bc2984 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml @@ -22,7 +22,7 @@ diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java index e65297ade2..013a3ea978 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java @@ -53,6 +53,8 @@ import java.util.Date; public class ScmCollectionRebateWithApply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java index f3f295d5b0..02ff147b52 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java @@ -58,6 +58,8 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") 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 37a322c07d..1cfc5ee92a 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 @@ -58,6 +58,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java index f30e87391b..72543e58e9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java @@ -55,14 +55,16 @@ public class ScmCollectionRebateWithApplyQuery implements Query { private String deptName; @ApiModelProperty("创建人姓名") private String createByName; - @ApiModelProperty("回款申请标题") - private String collectionApply; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("创建日期") private String createStartTime; private String createEndTime; @ApiModelProperty("办结日期") private String finishTimeStart; private String finishTimeEnd; + @ApiModelProperty("回款申请标题") + private String collectionApply; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java index 72eb53ced5..67bebf2a68 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java @@ -56,24 +56,24 @@ public class ScmCollectionRebateWithApplyVo implements Vo { @ApiModelProperty("流程状态") private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("回款申请标题") - private String collectionApply; - @ApiModelProperty("预提返利") - private String estimateRebate; - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("创建人姓名") - private String createByName; @ApiModelProperty("部门") private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; + @ApiModelProperty("回款申请标题") + private String collectionApply; + @ApiModelProperty("预提返利") + private String estimateRebate; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java index 8a2c932825..3310e9fb78 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java @@ -60,12 +60,12 @@ public interface ScmSpecialRebateFeign { @PostMapping("/adjustment") @ResponseBody public ResultBean adjustment(@RequestBody ScmSpecialRebateSpecialAdjDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -98,7 +98,7 @@ public interface ScmSpecialRebateFeign { @ApiOperation(value = "一次导入") @PostMapping("/getExcelOneInfo") @ResponseBody - public ResultBean getExcelOneInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath) throws IOException, ParseException; + public ResultBean getExcelOneInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException; @ApiOperation("二次导出") @PostMapping("/excelListTwo") @@ -107,6 +107,6 @@ public interface ScmSpecialRebateFeign { @ApiOperation(value = "二次导入") @PostMapping("/getExcelTwoInfo") @ResponseBody - public ResultBean getExcelTwoInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request,@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath) throws IOException, ParseException; + public ResultBean getExcelTwoInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index d33eb290e8..c89f416ad9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java @@ -68,27 +68,27 @@ public class ScmSpecialRebateVo implements Vo { @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; @ApiModelProperty("待确定金额(动态)") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java index 74bbfc9195..94cdb33917 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java @@ -50,31 +50,33 @@ import lombok.Data; public class ScmSpecialrebateCheckapply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java index 39485a44ff..2a86f96195 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java @@ -58,38 +58,40 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo { private String sid; // sid - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java index 2df0c21833..f4ef82189f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java @@ -58,31 +58,33 @@ public class ScmSpecialrebateCheckapplyDto implements Dto { private String createBySid; // 创建人sid @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java index d919a5f29a..52277dbd0f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java @@ -65,7 +65,6 @@ public interface ScmSpecialrebateCheckapplyFeign { @PostMapping("/rePushVoucher") public ResultBean rePushVoucher(@RequestParam("sid") String sid); - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody @@ -75,12 +74,12 @@ public interface ScmSpecialrebateCheckapplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java index 64ae2780fc..e2f10ecd1a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java @@ -51,16 +51,20 @@ public class ScmSpecialrebateCheckapplyQuery implements Query { @ApiModelProperty("分公司") private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建日期") + private String createStartTime; + private String createEndTime; + @ApiModelProperty("办结日期") + private String finishTimeStart; + private String finishTimeEnd; @ApiModelProperty("核对申请标题") - private String checkApply; // 核对申请标题 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + private String checkApply; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java index 9015e07a90..863ca67eac 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java @@ -52,35 +52,41 @@ import java.util.Date; @ApiModel(value = "专项返利核对申请表 视图数据对象", description = "专项返利核对申请表 视图数据对象") public class ScmSpecialrebateCheckapplyVo implements Vo { - private String sid; // sid + private String sid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") - private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") - private String createByName; // 创建人姓名 + private String createByName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // 创建日期 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; + @ApiModelProperty("核对申请标题") + private String checkApply; @ApiModelProperty("预计返利") - private String estimateRebate; // 预计返利 + private String estimateRebate; @ApiModelProperty("其中预提费用") private String withholdCost; @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private String uploadMoney; @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + private String stayDetermineMoney; @ApiModelProperty("费用") - private String money; // 费用 + private String money; @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 + private String adjustmentMoney; + @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id + private String procDefId; @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + private String procInstId; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java index 0ef42b353f..975cf8cc8d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java @@ -57,6 +57,10 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -88,10 +92,6 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity { @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("采购系统sid") - private String purchaseSystemSid; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; @ApiModelProperty("所属年月") private String palceGenDate; @ApiModelProperty("一次核对状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java index 0f8f6cd254..8d6c1b7c46 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java @@ -53,6 +53,10 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 @ApiModelProperty("预提日期(页面展示)") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java index 68a0d5ed4c..ee592f69ad 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java @@ -59,6 +59,10 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -90,10 +94,6 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto { @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("采购系统sid") - private String purchaseSystemSid; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; @ApiModelProperty("所属年月") private String palceGenDate; @ApiModelProperty("一次核对状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java index 0eec774ec2..d3bba1cb26 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java @@ -57,26 +57,6 @@ import java.util.List; fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class) public interface ScmSpecialrebateCheckapplydetailFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("专项返利核对查看详情") @GetMapping("/specialRebateCheckDetails/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java index d8802c696f..1915e13e4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java @@ -36,28 +36,6 @@ import java.util.List; @Component public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecialrebateCheckapplydetailFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/listPage无法访问"); - } - - @Override - public ResultBean save(ScmSpecialrebateCheckapplydetailDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/fetchDetailsBySid无法访问"); - } - @Override public ResultBean> specialRebateCheckDetails(String sid) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java deleted file mode 100644 index 5fcf7dabb5..0000000000 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java +++ /dev/null @@ -1,57 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail; - - -import com.yxt.common.core.query.Query; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: anrui-scm(专项返利)
- * File: ScmSpecialrebateCheckapplydetailQuery.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery
- * Description: 专项返利核对申请表_返利列表 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-09 09:14:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "专项返利核对申请表_返利列表 查询条件", description = "专项返利核对申请表_返利列表 查询条件") -public class ScmSpecialrebateCheckapplydetailQuery implements Query { - - @ApiModelProperty("专项返利sid") - private String specialRebateSid; // 专项返利sid - @ApiModelProperty("核对申请sid") - private String mainSid; // 核对申请sid - -} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java index 96022b5003..43ca6474aa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java @@ -58,6 +58,10 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -89,10 +93,6 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo { @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("采购系统sid") - private String purchaseSystemSid; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; @ApiModelProperty("所属年月") private String palceGenDate; @ApiModelProperty("一次核对状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java index 2655520011..ec9f7495e7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java @@ -60,13 +60,13 @@ public class ScmSpecialRebateWithDetailsVo implements Vo { private String withRebate; // 预提返利 @ApiModelProperty("专项返利sid") private List specialRebateSids; // 专项返利sid - @ApiModelProperty("专项返利sid") + @ApiModelProperty("专项返利sid") private String specialRebateSid; // 专项返利sid @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("专项返利预提申请sid") + @ApiModelProperty("专项返利预提申请sid") private String mainSid; // 专项返利预提申请sid @ApiModelProperty("采购系统sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java index b041b3b6fe..f84dea8976 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java @@ -57,26 +57,6 @@ import java.util.List; fallback = ScmSpecialRebateWithFeignFallback.class) public interface ScmSpecialRebateWithFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody ScmSpecialRebateWithDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("专项返利预提查看详情") @GetMapping("/specialRebateWithDetails/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java index 986401ad39..ac3e22463a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java @@ -50,31 +50,33 @@ import lombok.Data; public class ScmSpecialRebateWithApply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java index f9fb1cacf0..8e745ae280 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java @@ -59,31 +59,33 @@ public class ScmSpecialRebateWithApplyDetailsVo implements Vo { private String createBySid; // 申请人sid @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java index a81e868cd8..8ed4077022 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java @@ -57,33 +57,35 @@ public class ScmSpecialRebateWithApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java index 3e6086e4e3..afa7c34930 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java @@ -65,7 +65,6 @@ public interface ScmSpecialRebateWithApplyFeign { @PostMapping("/rePushVoucher") public ResultBean rePushVoucher(@RequestParam("sid") String sid); - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody @@ -75,12 +74,12 @@ public interface ScmSpecialRebateWithApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java index f272ce05b1..91f4e17e88 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java @@ -51,17 +51,20 @@ public class ScmSpecialRebateWithApplyQuery implements Query { @ApiModelProperty("分公司名称") private String createOrgName; - @ApiModelProperty("预提申请") - private String withApply; // 预提申请 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建开始") + private String createStartTime; + private String createEndTime; @ApiModelProperty("办结日期") private String finishTimeStart; private String finishTimeEnd; - @ApiModelProperty("流程状态") - private String nodeState; + @ApiModelProperty("预提申请") + private String withApply; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java index b25e28ac41..3e0f3f3794 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java @@ -54,26 +54,28 @@ public class ScmSpecialRebateWithApplyVo implements Vo { private String sid; // sid + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // 创建日期 + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; - @ApiModelProperty("申请部门名称") - private String deptName; @ApiModelProperty("预提申请") - private String withApply; // 预提申请 + private String withApply; @ApiModelProperty("预提返利合计") - private Integer withRebateTotal; // 预提返利合计 + private Integer withRebateTotal; @ApiModelProperty("其中预提费用") private String withholdCost; - @ApiModelProperty("创建人姓名") - private String createByName; // 创建人姓名 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") - private String nodeState; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") 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 31b17ca2c6..7bac972547 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 @@ -7,13 +7,13 @@ resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo"> SELECT scrwa.*, - SUM(scr.`estimateRebate`) estimateRebate + SUM(scr.estimateRebate) estimateRebate FROM scm_collection_rebate_with_apply scrwa LEFT JOIN scm_collection_rebate_with scrw - ON scrwa.`sid` = scrw.`mainSid` + ON scrwa.sid = scrw.mainSid LEFT JOIN scm_collection_rebate scr - ON scr.`sid` = scrw.`collectionRebateSid` + ON scr.sid = scrw.collectionRebateSid ${ew.sqlSegment} 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 5b25524889..d745b903a6 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 @@ -162,6 +162,9 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + int selectBySid(String join); int updateFlowFiled(Map beanToMap); + + String selectNum(String billNo); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml index a2fac108d1..41e1bf5ded 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml @@ -31,6 +31,9 @@ UPDATE scm_specialrebate_checkapply SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} @@ -42,4 +45,12 @@ 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/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 8a532e10f8..7136ecabfa 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -46,96 +46,96 @@ import java.util.List; @RequestMapping("v1/scmspecialrebatecheckapply") public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckapplyFeign { - @Autowired - private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService; - - @Override - public ResultBean rePushVoucher(String sid) { - ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid,"1"); - return rb.success(); - } - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialrebateCheckapplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto){ - return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService; + + @Override + public ResultBean rePushVoucher(String sid) { + ResultBean rb = ResultBean.fireFail(); + scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1"); + return rb.success(); + } + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmSpecialrebateCheckapplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto) { + return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return scmSpecialrebateCheckapplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return scmSpecialrebateCheckapplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid); - } - - @Override - public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) { - return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto); - } - - @Override - public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); - return scmSpecialrebateCheckapplyService.complete(bv); - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo); - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo); - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo); - } - - @Override - public ResultBean flowRecord(String procInsId) { - return scmSpecialrebateCheckapplyService.flowRecord(procInsId); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) { - return scmSpecialrebateCheckapplyService.delegate(query); - } - - @Override - public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) { - return scmSpecialrebateCheckapplyService.assignTask(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) { + return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto); + } + + @Override + public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + return scmSpecialrebateCheckapplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmSpecialrebateCheckapplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) { + return scmSpecialrebateCheckapplyService.delegate(query); + } + + @Override + public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) { + return scmSpecialrebateCheckapplyService.assignTask(query); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 568a7d9577..5461f29fcc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -149,6 +151,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String finishTimeStart = query.getFinishTimeStart(); + String finishTimeEnd = query.getFinishTimeEnd(); + qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (ssc.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (ssc.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); qw.groupBy("ssc.sid"); qw.orderByDesc("ssc.createTime"); IPage page = PagerUtil.queryToPage(pq); @@ -173,6 +189,18 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - @Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}") + @Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}") void delByMainSid(String sid); - List fetchWhenDetailsVoBySid(String sid); + List fetchWhenDetailsVoBySid(String sid); - List fetchLastDetailsVoBySid(String sid); + List fetchLastDetailsVoBySid(String sid); - @Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}") + @Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}") List selByMainSid(String sid); - List fetchBySpecialRebateSid(String mainSid); + List fetchBySpecialRebateSid(String mainSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml index 1bd531a148..fda85acbc1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml @@ -3,24 +3,19 @@ - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java index a89aa98a8d..913a2d8e58 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java @@ -26,20 +26,12 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; -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.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign; /** @@ -63,42 +55,6 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe @Autowired private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialrebateCheckapplydetailService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto){ - ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplydetailService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplydetailService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - ScmSpecialrebateCheckapplydetailDetailsVo vo = scmSpecialrebateCheckapplydetailService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - @Override public ResultBean> specialRebateCheckDetails(String sid) { return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java index 88f4710f7e..7fa5b8bec9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java @@ -26,26 +26,16 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; 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.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; -import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -63,30 +53,6 @@ import java.util.List; */ @Service public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmSpecialrebateCheckapplydetailQuery 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) { - ScmSpecialrebateCheckapplydetailQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmSpecialrebateCheckapplydetailDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } public void insertByDto(ScmSpecialrebateCheckapplydetailDto dto) { ScmSpecialrebateCheckapplydetail entity = new ScmSpecialrebateCheckapplydetail(); @@ -94,23 +60,6 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< baseMapper.insert(entity); } - public void updateByDto(ScmSpecialrebateCheckapplydetailDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - ScmSpecialrebateCheckapplydetail entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmSpecialrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid) { - ScmSpecialrebateCheckapplydetail entity = fetchBySid(sid); - ScmSpecialrebateCheckapplydetailDetailsVo vo = new ScmSpecialrebateCheckapplydetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - public void delByMainSid(String sid) { baseMapper.delByMainSid(sid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java index 4e5ec5c16c..80212c6f7b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java @@ -25,21 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmspecialrebatewith; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith; -import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo; import java.util.List; -import java.util.Map; /** * Project: anrui-scm(专项返利)
@@ -57,8 +50,6 @@ import java.util.Map; @Mapper public interface ScmSpecialRebateWithMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Delete("delete from scm_special_rebate_with where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml index e132af50d8..3d0733f32e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml @@ -3,12 +3,6 @@ - + select RIGHT (billNo, 4) + from scm_special_rebate_with_apply + where billNo LIKE concat(#{billNo}, '%') + order by billNo desc + limit 1 + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java index 527bddb9ae..f6eba7338a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java @@ -55,100 +55,100 @@ import java.util.List; * @since 1.0 */ @Api(tags = "专项返利预提申请表") -@RestController("com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyRest") +@RestController @RequestMapping("v1/scmspecialrebatewithapply") public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyFeign { - @Autowired - private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService; - - @Override - public ResultBean rePushVoucher(String sid) { - ResultBean rb = ResultBean.fireFail(); - scmSpecialRebateWithApplyService.pushSpecialRebateWithVoucher(sid); - return rb.success(); - } - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialRebateWithApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto){ - return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService; + + @Override + public ResultBean rePushVoucher(String sid) { + ResultBean rb = ResultBean.fireFail(); + scmSpecialRebateWithApplyService.pushSpecialRebateWithVoucher(sid); + return rb.success(); + } + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmSpecialRebateWithApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto) { + return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return scmSpecialRebateWithApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return scmSpecialRebateWithApplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid); - } - - @Override - public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) { - return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto); - } - - @Override - public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); - return scmSpecialRebateWithApplyService.complete(bv); - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo); - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return scmSpecialRebateWithApplyService.taskReject(flowTaskVo); - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo); - } - - @Override - public ResultBean flowRecord(String procInsId) { - return scmSpecialRebateWithApplyService.flowRecord(procInsId); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean delegate(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { - return scmSpecialRebateWithApplyService.delegate(delegateQuery); - } - - @Override - public ResultBean assignTask(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { - return scmSpecialRebateWithApplyService.assignTask(delegateQuery); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid); + } + + @Override + public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) { + return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto); + } + + @Override + public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + return scmSpecialRebateWithApplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmSpecialRebateWithApplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmSpecialRebateWithApplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean delegate(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { + return scmSpecialRebateWithApplyService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { + return scmSpecialRebateWithApplyService.assignTask(delegateQuery); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java index c423a1f608..6626745156 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatewithapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -167,6 +169,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService specialRebateSids = scmSpecialRebateWithDto.getSpecialRebateSids(); diff --git a/工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc b/工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc index 0b7aee86fc66e3bacca782786d2b929f21d40213..5d5070bc94c553eb0b5d7a7b231b7ebc05a345d4 100644 GIT binary patch literal 36352 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 ixL15A_dt`|2AF&`0 literal 18432 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