diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index f00b7e2f47..f4ec700e2c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -30,6 +30,10 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jacob.activeX.ActiveXComponent; +import com.jacob.com.ComThread; +import com.jacob.com.Dispatch; +import com.jacob.com.Variant; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; @@ -58,7 +62,6 @@ import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.WordConvertUtils; import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -67,6 +70,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import sun.misc.BASE64Encoder; import java.io.*; import java.text.NumberFormat; @@ -425,9 +429,8 @@ public class FinPaymentrecordService extends MybatisBaseService photoList = new ArrayList<>(); + dataMap.put("photoPath64", photoList); //获取模板 // 模板路径 String sourcePath = "D:\\anrui\\upload\\template\\"; @@ -447,13 +450,13 @@ public class FinPaymentrecordService extends MybatisBaseService - + - + - + + pkg:contentType="application/vnd.openxmlformats-package.relationships+xml"> - + <#list photoPath64 as lc> + + + - - - - - - - + xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" + xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" + mc:Ignorable="w14 w15 wp14"> - + - + - + @@ -86,73 +80,95 @@ 预付款申请 - - - + + + + + - 河北安瑞汽车租赁集团有限公司 + 河北安瑞汽车租赁集团有限公司 + - + - + - + 创建时间： + - 创建时间： - - - ${createTime!} - - + + + - - - - - - + + + + + + - + + + + + + + - - - + + + - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -165,27 +181,46 @@ - + - - + + + + + ${applyCode!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -198,68 +233,98 @@ - + - - + + + + + ${createByName!} - + + + + + + + + + + + + + + + + + - + - - + + - + - 创建 + 创建人部门 - - - - - - 人部门 - - - + - - + + + + + ${createByDeptName!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -272,27 +337,46 @@ - + - - + + + + + ${createOrgName!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -305,27 +389,46 @@ - + - - + + + + + ${remarks!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -338,27 +441,46 @@ - + - - + + + + + ${receiveCompany!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -371,27 +493,46 @@ - + - - + + + + + ${receiveBank!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -404,27 +545,46 @@ - + - - + + + + + ${receiveBankAccount!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -437,27 +597,46 @@ - + - - + + + + + ${cost!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -470,27 +649,46 @@ - + - - + + + + + ${payRemark!} - + + + + + + + + + + + + + + + + + - + - - + + - + @@ -503,28 +701,47 @@ - + - - + + + + + ${fileName!} - + + + + + + + + + + + + + + + + + - + - + - + - + @@ -537,524 +754,421 @@ <#list lcList as lc> - <#if (lc_index==0)> - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - + <#if (lc_index==0)> + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + <#list lcList as lc> - <#if (lc_index>0)> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - - + <#if (lc_index>0)> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + ${lc.name} + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#list photoPath64 as lc> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + - - + + + + + + + + - + - - - - - - - - - - - - - - - - + + + Organization + 2 + 170 + 401 + 3 + 1 + 0 + false + false + 438 + WPS Office_11.1.0.12763_F1E327BC-269C-435d-A152-05C5408002CA + 0 + - + - - - - - - - - - - - - - - - - + + 2022-11-13T02:11:00Z + God + God + 2022-11-17T10:08:17Z + 2 + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 2052-11.1.0.12763 + + + C399C22D01E64179BB0BBEDE1A5EF57B + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#list photoPath64 as lc> + + ${lc} + + + + - - - - + xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" + xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14"> + + + + + - + + + - - - - - - - - - - - @@ -1083,7 +1197,7 @@ w:val="11"/> - + @@ -1102,27 +1216,36 @@ + + + + + + + + + + - @@ -1140,749 +1263,402 @@ w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2052-11.1.0.12598 - - - 046113D258F44AE9B09038F928168180 - - - - - - - - God - Windows 用户 - 2 - 2022-11-13T02:11:00Z - 2022-11-13T02:11:00Z - - - - - - + xmlns:w10="urn:schemas-microsoft-com:office:word" + xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" + xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + - + - - + + + @@ -1895,12 +1671,13 @@ - + - - + + + @@ -1908,17 +1685,18 @@ - + - + - - + + + @@ -1930,12 +1708,13 @@ - + - - + + + @@ -1943,67 +1722,24 @@ - + - + - - + + - + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2012,74 +1748,68 @@ - - - - - + + + + + + - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - + + + + + + + + + - - - - + + - + - - - + + + - + @@ -2093,10 +1823,62 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + @@ -2109,88 +1891,290 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 1 - 64 - 367 - Microsoft Office Word - 0 - 3 - 1 - false - Organization - false - 430 - false - false - 14.0000 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java index 5851406c98..66907d5646 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java @@ -53,8 +53,10 @@ public class ScmCollectionRebateQuery implements Query { @ApiModelProperty("回款方式key") private String collectionTypeKey; // 回款方式key - @ApiModelProperty("回款日期") - private String collectionDate; // 回款日期 + @ApiModelProperty("回款开始日期") + private String collectionStartDate; // 回款开始日期 + @ApiModelProperty("回款结束日期") + private String collectionEndDate; // 回款结束日期 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("创建开始日期") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java index 6394e305a3..ac208a9fca 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java @@ -50,31 +50,31 @@ import lombok.Data; public class ScmCollectionrebateCheckapply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @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 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java index 0b61622a97..d29e49268f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java @@ -56,31 +56,31 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @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("本月核对本月已上传回款返利信息") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java index b85a0fb13f..44b036e214 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java @@ -58,31 +58,31 @@ public class ScmCollectionrebateCheckapplyDto implements Dto { private String createBySid; // 创建人sid @ApiModelProperty("备注") private String remarks; // 备注 - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @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("本月核对本月已上传回款返利信息") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java index a041cefd5c..982b38da2f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java @@ -65,12 +65,12 @@ public interface ScmCollectionrebateCheckapplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto 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/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java index eea48ec7da..6ea8bca047 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java @@ -48,25 +48,25 @@ import java.util.List; @Component public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollectionrebateCheckapplyFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/listPage无法访问"); + } - @Override - public ResultBean save(ScmCollectionrebateCheckapplyDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/save无法访问"); - } + @Override + public ResultBean save(ScmCollectionrebateCheckapplyDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/save无法访问"); + } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/delBySids无法访问"); - } + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/delBySids无法访问"); + } - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问"); - } + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问"); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java index 9607bd4f84..7e88bb5916 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java @@ -49,14 +49,14 @@ import lombok.Data; @ApiModel(value = "回款返利核对申请表 查询条件", description = "回款返利核对申请表 查询条件") public class ScmCollectionrebateCheckapplyQuery implements Query { - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty(value = "创建开始日期") private String createStartTime; @ApiModelProperty(value = "创建结束日期") private String createEndTime; - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java index b289f0e8c5..625251c084 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java @@ -51,21 +51,21 @@ public class ScmCollectionrebateCheckapplyVo implements Vo { private String sid; // sid - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @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("回款金额") private String collectionMoney; // 回款金额 @@ -75,15 +75,15 @@ public class ScmCollectionrebateCheckapplyVo implements Vo { private String uploadMoney; // 上传金额 @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @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 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java index 13ed8e83c2..444c7562ee 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java @@ -50,9 +50,9 @@ import lombok.Data; public class ScmCollectionrebateCheckapplydetail extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("回款返利sid") + @ApiModelProperty("回款返利sid") private String collectionRebateSid; // 回款返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java index 1835d4cab7..9215729d07 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java @@ -51,9 +51,9 @@ public class ScmCollectionrebateCheckapplydetailDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("回款返利sid") + @ApiModelProperty("回款返利sid") private String collectionRebateSid; // 回款返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java index 8490fe3531..61638b1323 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java @@ -55,7 +55,7 @@ public class ScmCollectionrebateCheckapplydetailDto implements Dto { @ApiModelProperty("回款返利sid") private List collectionRebateSids; // 回款返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java index 751f70fb6d..f2f1069327 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java @@ -65,12 +65,12 @@ public interface ScmCollectionrebateCheckapplydetailFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto 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/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java index 1780b579fb..ef66e06eec 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java @@ -48,25 +48,25 @@ import java.util.List; @Component public class ScmCollectionrebateCheckapplydetailFeignFallback implements ScmCollectionrebateCheckapplydetailFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问"); + } - @Override - public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问"); - } + @Override + public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问"); + } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问"); - } + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问"); + } - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问"); - } + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问"); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java index 64daa11f89..178edfa383 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java @@ -49,9 +49,9 @@ import lombok.Data; @ApiModel(value = "回款返利核对申请表_返利列表 查询条件", description = "回款返利核对申请表_返利列表 查询条件") public class ScmCollectionrebateCheckapplydetailQuery implements Query { - @ApiModelProperty("回款返利sid") + @ApiModelProperty("回款返利sid") private String collectionRebateSid; // 回款返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java index 5784d552a5..b5f761ef3d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java @@ -51,9 +51,9 @@ public class ScmCollectionrebateCheckapplydetailVo implements Vo { private String sid; // sid - @ApiModelProperty("回款返利sid") + @ApiModelProperty("回款返利sid") private String collectionRebateSid; // 回款返利sid - @ApiModelProperty("核对申请sid") + @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index 29dc985454..c0c5ccef14 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -76,9 +76,11 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). @@ -140,9 +142,11 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). @@ -165,9 +169,11 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). @@ -197,9 +203,11 @@ public class ScmCollectionRebateService extends MybatisBaseService= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java index 42ae68f074..c2cc361592 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java @@ -53,13 +53,9 @@ import java.util.List; @Mapper public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper { - //@Update("update scm_collectionrebate_checkapply set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_collectionrebate_checkapply") - List selectListVo(); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + List selectListVo(); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml index ae4b927e4c..15794482d1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml @@ -29,4 +29,10 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java index 4e2647cc7a..9b2d8228d7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java @@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; + import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; @@ -55,44 +56,44 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCh * @since 1.0 */ @Api(tags = "回款返利核对申请表") -@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyRest") +@RestController @RequestMapping("v1/scmcollectionrebatecheckapply") public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateCheckapplyFeign { - @Autowired - private ScmCollectionrebateCheckapplyService scmCollectionrebateCheckapplyService; + @Autowired + private ScmCollectionrebateCheckapplyService scmCollectionrebateCheckapplyService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmCollectionrebateCheckapplyService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionrebateCheckapplyService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto){ - return scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto) { + return scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmCollectionrebateCheckapplyService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + scmCollectionrebateCheckapplyService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java index 0f790e028b..05c3b6b3e1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java @@ -64,128 +64,128 @@ import java.util.List; @Service public class ScmCollectionrebateCheckapplyService extends MybatisBaseService { - @Autowired - private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; + @Autowired + private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; - private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplyQuery 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) { - ScmCollectionrebateCheckapplyQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("ssc.brandSid", query.getBrandSid()); - } - if (StringUtils.isNotBlank(query.getCheckApply())) { - qw.like("ssc.checkApply", query.getCheckApply()); - } - String createStartTime = query.getCreateStartTime(); - String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - qw.eq("ssc.createOrgSid", query.getCreateOrgSid()); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (ScmCollectionrebateCheckapplyVo record : records) { - record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf("."))); - record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf("."))); - record.setCollectionMoney(record.getCollectionMoney().substring(0,record.getCollectionMoney().lastIndexOf("."))); - record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf("."))); - } - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - String dtoSid = dto.getSid(); - List scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails(); - List scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails(); - if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) { - return rb.setMsg("请选择已核对回款返利信息"); - } - if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto).getData(); - if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(sid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } - } - if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(sid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } - } - return rb.success().setMsg("添加成功").setData(sid); - } - ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dtoSid); - if (scmCollectionrebateCheckapply == null) { - return rb.setMsg("该核对申请单不存在"); - } - this.updateByDto(dto); - scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid); - if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } - } - if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { - for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { - for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { - ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); - scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); - scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); - scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); - } - } - } - return rb.success().setMsg("修改成功").setData(dtoSid); - } - - public ResultBean insertByDto(ScmCollectionrebateCheckapplyDto dto){ - ResultBean rb = ResultBean.fireFail(); - ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - entity.setNodeState("待提交"); - baseMapper.insert(entity); - return rb.success().setData(entity.getSid()); - } - - public void updateByDto(ScmCollectionrebateCheckapplyDto dto){ - String dtoSid = dto.getSid(); + private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplyQuery 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) { + ScmCollectionrebateCheckapplyQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("ssc.brandSid", query.getBrandSid()); + } + if (StringUtils.isNotBlank(query.getCheckApply())) { + qw.like("ssc.checkApply", query.getCheckApply()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + qw.eq("ssc.createOrgSid", query.getCreateOrgSid()); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + for (ScmCollectionrebateCheckapplyVo record : records) { + record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf("."))); + record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf("."))); + record.setCollectionMoney(record.getCollectionMoney().substring(0, record.getCollectionMoney().lastIndexOf("."))); + record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf("."))); + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails(); + List scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails(); + if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) { + return rb.setMsg("请选择已核对回款返利信息"); + } + if (StringUtils.isBlank(dtoSid)) { + String sid = this.insertByDto(dto).getData(); + if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { + for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { + ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); + scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); + scmCollectionrebateCheckapplydetail1.setMainSid(sid); + scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); + } + } + } + if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { + for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { + ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); + scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); + scmCollectionrebateCheckapplydetail1.setMainSid(sid); + scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); + } + } + } + return rb.success().setMsg("添加成功").setData(sid); + } + ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dtoSid); + if (scmCollectionrebateCheckapply == null) { + return rb.setMsg("该核对申请单不存在"); + } + this.updateByDto(dto); + scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid); + if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { + for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { + ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); + scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); + scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); + scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); + } + } + } + if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { + for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { + for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { + ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); + scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); + scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); + scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); + } + } + } + return rb.success().setMsg("修改成功").setData(dtoSid); + } + + public ResultBean insertByDto(ScmCollectionrebateCheckapplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setNodeState("待提交"); + baseMapper.insert(entity); + return rb.success().setData(entity.getSid()); + } + + public void updateByDto(ScmCollectionrebateCheckapplyDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmCollectionrebateCheckapply entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid){ - ScmCollectionrebateCheckapply entity = fetchBySid(sid); - ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + ScmCollectionrebateCheckapply entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid) { + ScmCollectionrebateCheckapply entity = fetchBySid(sid); + ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java index 578b8e6c1b..6ec13a43e8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java @@ -54,16 +54,11 @@ import java.util.List; @Mapper public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper { - //@Update("update scm_collectionrebate_checkapplydetail set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from scm_collectionrebate_checkapplydetail") List selectListVo(); - @Delete("delete from scm_collectionrebate_checkapplydetail where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml index e14ef348a8..ae03345741 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml @@ -1,13 +1,33 @@ - - - - - + + + + + + + + + + DELETE + FROM scm_collectionrebate_checkapplydetail + WHERE mainSid = #{dtoSid} + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java index 573a0a9af8..5f2499824b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java @@ -55,7 +55,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionre * @since 1.0 */ @Api(tags = "回款返利核对申请表_返利列表") -@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailRest") +@RestController @RequestMapping("v1/scmcollectionrebatecheckapplydetail") public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionrebateCheckapplydetailFeign { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java index fe6ad89af4..e1739f36a0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java @@ -60,55 +60,53 @@ import java.util.List; */ @Service public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery 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) { - ScmCollectionrebateCheckapplydetailQuery 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(ScmCollectionrebateCheckapplydetailDto dto){ + private QueryWrapper createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionrebateCheckapplydetailQuery 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(ScmCollectionrebateCheckapplydetailDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(ScmCollectionrebateCheckapplydetailDto dto){ - ScmCollectionrebateCheckapplydetail entity = new ScmCollectionrebateCheckapplydetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(ScmCollectionrebateCheckapplydetailDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionrebateCheckapplydetailDto dto) { + ScmCollectionrebateCheckapplydetail entity = new ScmCollectionrebateCheckapplydetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionrebateCheckapplydetailDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmCollectionrebateCheckapplydetail entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmCollectionrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid){ - ScmCollectionrebateCheckapplydetail entity = fetchBySid(sid); - ScmCollectionrebateCheckapplydetailDetailsVo vo = new ScmCollectionrebateCheckapplydetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + ScmCollectionrebateCheckapplydetail entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid) { + ScmCollectionrebateCheckapplydetail entity = fetchBySid(sid); + ScmCollectionrebateCheckapplydetailDetailsVo vo = new ScmCollectionrebateCheckapplydetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } } \ No newline at end of file