From 079c4e9221803df47d5bb6087690441f6d5ba314 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 25 Dec 2024 15:12:13 +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 --- .../scmspecialrebate/ScmStayDisRebateVo.java | 10 +- .../ScmSpecialrebateCheckapply.java | 6 + .../ScmSpecialrebatedistribute.java | 32 ++-- .../ScmSpecialrebatedistributeDetailsVo.java | 30 ++-- .../ScmSpecialrebatedistributeDto.java | 28 +-- .../ScmSpecialrebatedistributeFeign.java | 4 +- .../ScmSpecialrebatedistributeQuery.java | 26 +-- .../ScmSpecialrebatedistributeVo.java | 39 ++-- .../ScmSpecialRebateWithApply.java | 8 +- .../ScmSpecialRebateMapper.xml | 7 +- ...mSpecialrebateCheckapplydetailService.java | 14 +- .../ScmSpecialrebatedistributeMapper.java | 8 +- .../ScmSpecialrebatedistributeMapper.xml | 20 ++- .../ScmSpecialrebatedistributeRest.java | 166 +++++++++--------- .../ScmSpecialrebatedistributeService.java | 39 +++- .../ScmSpecialrebatedistributedetailRest.java | 2 +- 16 files changed, 257 insertions(+), 182 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java index 6b2dcf2144..f8903b8ee4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java @@ -53,6 +53,8 @@ public class ScmStayDisRebateVo implements Vo { private String sid; // sid + @ApiModelProperty("核对申请sid") + private String checkApplySid; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("采购系统sid") @@ -74,13 +76,13 @@ public class ScmStayDisRebateVo implements Vo { private String withholdingDate; @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("预提返利") + @ApiModelProperty("预提返利") private String estimateRebate; // 预提返利 - @ApiModelProperty("上传总金额") + @ApiModelProperty("上传总金额") private String uploadMoney; // 上传总金额 @ApiModelProperty("所属年月") private String palceGenDate; 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 94cdb33917..526237e5d2 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 @@ -26,11 +26,14 @@ package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(专项返利)
* File: ScmSpecialrebateCheckapply.java
@@ -52,6 +55,9 @@ public class ScmSpecialrebateCheckapply extends BaseEntity { @ApiModelProperty("单据编号") private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java index 544d21eb7c..25a195c7b4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java @@ -53,38 +53,40 @@ import java.util.Date; public class ScmSpecialrebatedistribute extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid @ApiModelProperty("申请部门名称") private String deptName; @ApiModelProperty("申请人") private String createByName; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @ApiModelProperty("办结日期") - private Date finishTime; // 办结日期 - @ApiModelProperty("分配申请") + @ApiModelProperty("分配申请") private String title; // 分配申请 - @ApiModelProperty("预提返利") + @ApiModelProperty("预提返利") private String withRebate; // 预提返利 - @ApiModelProperty("分配总金额") + @ApiModelProperty("分配总金额") private String distributionMoneyTotal; // 分配总金额 - @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 private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java index 0f95c1651c..ad17b80647 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java @@ -56,43 +56,45 @@ public class ScmSpecialrebatedistributeDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid @ApiModelProperty("申请部门名称") private String deptName; @ApiModelProperty("申请人") private String createByName; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; // 办结日期 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("分配申请") + @ApiModelProperty("分配申请") private String title; // 分配申请 - @ApiModelProperty("预提返利") + @ApiModelProperty("预提返利") private String withRebate; // 预提返利 - @ApiModelProperty("分配总金额") + @ApiModelProperty("分配总金额") private String distributionMoneyTotal; // 分配总金额 - @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 private String orgPath; @ApiModelProperty("分配申请的专项返利列表") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java index 4a760e11cf..ac2a45211a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java @@ -56,40 +56,42 @@ public class ScmSpecialrebatedistributeDto implements Dto { private String sid; // sid + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; // 申请部门sid @ApiModelProperty("申请部门名称") private String deptName; @ApiModelProperty("申请人") private String createByName; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; // 办结日期 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("分配申请") + @ApiModelProperty("分配申请") private String title; // 分配申请 - @ApiModelProperty("预提返利") + @ApiModelProperty("预提返利") private String withRebate; // 预提返利 - @ApiModelProperty("分配总金额") + @ApiModelProperty("分配总金额") private String distributionMoneyTotal; // 分配总金额 - @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 private String orgPath; @ApiModelProperty("分配申请的专项返利列表") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java index 58556027bb..cbf4536edd 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java @@ -70,12 +70,12 @@ public interface ScmSpecialrebatedistributeFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmSpecialrebatedistributeDto 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/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java index ec572bc6bc..862ff4a950 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java @@ -47,20 +47,24 @@ import lombok.Data; */ @Data @ApiModel(value = "专项返利分配申请表 查询条件", description = "专项返利分配申请表 查询条件") -public class ScmSpecialrebatedistributeQuery implements Query { +public class ScmSpecialrebatedistributeQuery implements Query { - @ApiModelProperty("分配申请") - private String title; // 分配申请 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid @ApiModelProperty("分公司") private String createOrgName; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; + @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 title; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java index 4a950b9db8..5accb1fafb 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java @@ -54,12 +54,22 @@ public class ScmSpecialrebatedistributeVo implements Vo { private String sid; // sid - @ApiModelProperty("状态") - private String state; - @ApiModelProperty("申请部门") - private String deptName; + @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; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("分配申请") private String title; @ApiModelProperty("预提返利") @@ -68,18 +78,11 @@ public class ScmSpecialrebatedistributeVo implements Vo { private String uploadMoney; @ApiModelProperty("分配总金额") private String distributionMoneyTotal; - @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 nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + @ApiModelProperty("分配数量") + private String disNum; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("流程实例的sid") + private String procInstId; } 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 ac3e22463a..ce9be6c2b6 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 @@ -26,11 +26,14 @@ package com.yxt.anrui.scm.api.scmspecialrebatewithapply; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui-scm(专项返利)
* File: ScmSpecialRebateWithApply.java
@@ -52,6 +55,9 @@ public class ScmSpecialRebateWithApply extends BaseEntity { @ApiModelProperty("单据编号") private String billNo; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") @@ -80,6 +86,4 @@ public class ScmSpecialRebateWithApply extends BaseEntity { private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; - @ApiModelProperty("办结日期") - private String finishTime; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index feeaaf3fb8..ce25bb9180 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -50,12 +50,13 @@ ssr.purchaseSystemName, ssr.palceGenDate, ssr.withholdingDate, - ssr.uploadMoney + ssr.secondaryUploadMoney - ssr.onceItureCost - ssr.onceTreatCost - ssr.onceSuppCost - ssr.secondItureCost - ssr.secondTreatCost - ssr.secondSuppCost as uploadMoney + ssr.uploadMoney + ssr.secondaryUploadMoney - ssr.onceItureCost - ssr.onceTreatCost - ssr.onceSuppCost - ssr.secondItureCost - ssr.secondTreatCost - ssr.secondSuppCost as uploadMoney, + sscad.mainSid as checkApplySid FROM scm_specialrebate_checkapplydetail sscad LEFT JOIN scm_special_rebate ssr - ON sscad.`specialRebateSid` = ssr.`sid` + ON sscad.specialRebateSid = ssr.sid LEFT JOIN scm_specialrebate_checkapply ssca - ON ssca.`sid` = sscad.`mainSid` + ON ssca.sid = sscad.mainSid ${ew.sqlSegment} 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 7fa5b8bec9..b88f24e1f2 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 @@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -78,10 +79,15 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< public ResultBean> specialRebateCheckDetails(String sid) { ResultBean rb = ResultBean.fireFail(); - List scmSpecialRebateDetailsVos = baseMapper.fetchBySpecialRebateSid(sid); - for (ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo : scmSpecialRebateDetailsVos) { - scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost())); - scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString()); + List scmSpecialRebateDetailsVos = new ArrayList<>(); + String[] sids = sid.split(","); + for (String s : sids) { + List scmSpecialRebateDetailsVos1 = baseMapper.fetchBySpecialRebateSid(s); + for (ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo : scmSpecialRebateDetailsVos1) { + scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost())); + scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString()); + scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo); + } } return rb.success().setData(scmSpecialRebateDetailsVos); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java index 8ea6baf4bf..f15f2cecc6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java @@ -55,12 +55,14 @@ import java.util.Map; @Mapper public interface ScmSpecialrebatedistributeMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - int selectBySid(String join); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + int selectBySid(String join); int updateFlowFiled(Map beanToMap); @Update("update scm_specialrebatedistribute set state = #{state} where sid = #{sid}") void updateState(@Param("sid") String sid, @Param("state") int state); + + 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/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml index 536f30cca0..d1596ae7ab 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml @@ -8,15 +8,16 @@ SELECT sp.*, SUM( - sr.`uploadMoney` + sr.`secondaryUploadMoney` - sr.`onceItureCost` - sr.`onceTreatCost` - sr.`onceSuppCost` - - sr.`secondItureCost` - sr.`secondTreatCost` - sr.`secondSuppCost` - ) AS uploadMoney + sr.uploadMoney + sr.secondaryUploadMoney - sr.onceItureCost - sr.onceTreatCost - sr.onceSuppCost - + sr.secondItureCost - sr.secondTreatCost - sr.secondSuppCost + ) AS uploadMoney, + GROUP_CONCAT(sr.sid) AS specialSid FROM scm_specialrebatedistribute sp LEFT JOIN scm_specialrebatedistributedetail sd ON sd.mainSid = sp.sid LEFT JOIN scm_special_rebate sr - ON sd.`specialRebateSid` = sr.`sid` + ON sd.specialRebateSid = sr.sid ${ew.sqlSegment} @@ -32,6 +33,9 @@ UPDATE scm_specialrebatedistribute SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} @@ -43,4 +47,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/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java index f92ba1fd37..5e2bd785ba 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java @@ -60,93 +60,93 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribu * @since 1.0 */ @Api(tags = "专项返利分配申请表") -@RestController("com.yxt.anrui.scm.biz.scmspecialrebatedistribute.ScmSpecialrebatedistributeRest") +@RestController @RequestMapping("v1/scmspecialrebatedistribute") public class ScmSpecialrebatedistributeRest implements ScmSpecialrebatedistributeFeign { - @Autowired - private ScmSpecialrebatedistributeService scmSpecialrebatedistributeService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialrebatedistributeService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialrebatedistributeDto dto){ - return scmSpecialrebatedistributeService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private ScmSpecialrebatedistributeService scmSpecialrebatedistributeService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmSpecialrebatedistributeService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmSpecialrebatedistributeDto dto) { + return scmSpecialrebatedistributeService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return scmSpecialrebatedistributeService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return scmSpecialrebatedistributeService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return scmSpecialrebatedistributeService.fetchDetailsVoBySid(sid); - } - - @Override - public ResultBean submitSpecialRebatedistribute(SubmitScmSpecialRebatedistributeDto dto) { - return scmSpecialrebatedistributeService.submitSpecialRebatedistribute(dto); - } - - @Override - public ResultBean complete(ScmSpecialRebatedistributeCompleteDto dto) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); - return scmSpecialrebatedistributeService.complete(bv); - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return scmSpecialrebatedistributeService.revokeProcess(flowTaskVo); - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return scmSpecialrebatedistributeService.taskReject(flowTaskVo); - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return scmSpecialrebatedistributeService.breakProcess(flowTaskVo); - } - - @Override - public ResultBean flowRecord(String procInsId) { - return scmSpecialrebatedistributeService.flowRecord(procInsId); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return scmSpecialrebatedistributeService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return scmSpecialrebatedistributeService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery query) { - return scmSpecialrebatedistributeService.delegate(query); - } - - @Override - public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery query) { - return scmSpecialrebatedistributeService.assignTask(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return scmSpecialrebatedistributeService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean submitSpecialRebatedistribute(SubmitScmSpecialRebatedistributeDto dto) { + return scmSpecialrebatedistributeService.submitSpecialRebatedistribute(dto); + } + + @Override + public ResultBean complete(ScmSpecialRebatedistributeCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + return scmSpecialrebatedistributeService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmSpecialrebatedistributeService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmSpecialrebatedistributeService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmSpecialrebatedistributeService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmSpecialrebatedistributeService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmSpecialrebatedistributeService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmSpecialrebatedistributeService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery query) { + return scmSpecialrebatedistributeService.delegate(query); + } + + @Override + public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery query) { + return scmSpecialrebatedistributeService.assignTask(query); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java index 4f757f78aa..d7436ac340 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java @@ -26,9 +26,11 @@ package com.yxt.anrui.scm.biz.scmspecialrebatedistribute; 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; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -36,6 +38,8 @@ import com.yxt.anrui.flowable.api.flow2.FlowFeign; 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.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; @@ -103,6 +107,8 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmSpecialrebatedistributeQuery query = pq.getParams(); @@ -147,20 +153,31 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (sp.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 (sp.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (sp.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); qw.groupBy("sp.sid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -173,6 +190,18 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService scmSpecialrebatedistributedetails = dto.getScmSpecialrebatedistributedetails(); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + billNo = "ZXFLFP" + sysOrganizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); String sid = this.insertByDto(dto).getData(); for (ScmSpecialrebatedistributedetailDto scmSpecialrebatedistributedetail : scmSpecialrebatedistributedetails) { ScmSpecialrebatedistributedetail scmSpecialrebatedistributedetail1 = new ScmSpecialrebatedistributedetail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailRest.java index 2c8db6e5ee..81a69923f3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailRest.java @@ -55,7 +55,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedi * @since 1.0 */ @Api(tags = "分配申请的专项返利列表") -@RestController("com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailRest") +@RestController @RequestMapping("v1/scmspecialrebatedistributedetail") public class ScmSpecialrebatedistributedetailRest implements ScmSpecialrebatedistributedetailFeign {