Browse Source

问题修改

master
God 2 years ago
parent
commit
3e20362d6f
  1. 19
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  2. 3060
      anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl
  3. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
  4. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapply.java
  5. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
  6. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java
  7. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java
  8. 36
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java
  9. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java
  10. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java
  11. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java
  12. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java
  13. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java
  14. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java
  15. 36
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java
  16. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java
  17. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java
  18. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
  19. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java
  20. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
  21. 63
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
  22. 242
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
  23. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java
  24. 38
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml
  25. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java
  26. 88
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java

19
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.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.BaseManufUpdateDto;
import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; 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.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; 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.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -67,6 +70,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import sun.misc.BASE64Encoder;
import java.io.*; import java.io.*;
import java.text.NumberFormat; import java.text.NumberFormat;
@ -425,9 +429,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
dataMap.put("cost", finPaymentrecord.getCost() + " " + "(" + s + ")"); dataMap.put("cost", finPaymentrecord.getCost() + " " + "(" + s + ")");
dataMap.put("payRemark", finPaymentrecord.getPayRemark()); dataMap.put("payRemark", finPaymentrecord.getPayRemark());
//获取图片路径 //获取图片路径
/*String photoPath = "D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg"; List<String> photoList = new ArrayList<>();
String photoPath64 = image2Base64(photoPath); dataMap.put("photoPath64", photoList);
dataMap.put("photoPath64", photoPath64);*/
//获取模板 //获取模板
// 模板路径 // 模板路径
String sourcePath = "D:\\anrui\\upload\\template\\"; String sourcePath = "D:\\anrui\\upload\\template\\";
@ -447,13 +450,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
//新生成的word路径 //新生成的word路径
String wordPath = targetPath + "\\" + typeName; String wordPath = targetPath + "\\" + typeName;
//为生成的word文档添加水印 //为生成的word文档添加水印
/*Document document = new Document(); /* Document document = new Document();
document.loadFromFile("sample.docx"); //插入文本水印 document.loadFromFile("sample.docx"); //插入文本水印
InsertTextWatermark(document.getSections().get(0)); //保存文档 InsertTextWatermark(document.getSections().get(0)); //保存文档
document.saveToFile("textwatermark.docx",FileFormat.Docx );*/ document.saveToFile("textwatermark.docx",FileFormat.Docx );*/
//生成出门证文件名 //生成出门证文件名
String pdfName = "预付款申请_" + dateStr + seconds + ".pdf"; String pdfName = "预付款申请_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName); WordUtils.doc2pdf(wordPath, targetPath, pdfName,"anrui");
/*try { /*try {
PdfWaterMark.addWaterMark("D:\\anrui\\upload\\" + "template/" + dateStr + "/" + pdfName,"D:\\anrui\\upload\\" + "template/" + dateStr + "/" + pdfName,createByName,10); PdfWaterMark.addWaterMark("D:\\anrui\\upload\\" + "template/" + dateStr + "/" + pdfName,"D:\\anrui\\upload\\" + "template/" + dateStr + "/" + pdfName,createByName,10);
} catch (Exception e) { } catch (Exception e) {
@ -480,7 +483,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
section.getDocument().setWatermark(txtWatermark); section.getDocument().setWatermark(txtWatermark);
}*/ }*/
/*public static String image2Base64(String imgUrl) { public static String image2Base64(String imgUrl) {
byte[] data = null; byte[] data = null;
// 读取图片字节数组 // 读取图片字节数组
try { try {
@ -496,7 +499,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
BASE64Encoder encoder = new BASE64Encoder(); BASE64Encoder encoder = new BASE64Encoder();
String base64Str = encoder.encode(data); String base64Str = encoder.encode(data);
return base64Str; return base64Str;
}*/ }
public static String upperCase2(double money) { public static String upperCase2(double money) {
String[] upNum = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"}; String[] upNum = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};

3060
anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl

File diff suppressed because it is too large

6
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") @ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款日期") @ApiModelProperty("回款开始日期")
private String collectionDate; // 回款日期 private String collectionStartDate; // 回款开始日期
@ApiModelProperty("回款结束日期")
private String collectionEndDate; // 回款结束日期
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建开始日期") @ApiModelProperty("创建开始日期")

26
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 { public class ScmCollectionrebateCheckapply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("品牌sid") @ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称") @ApiModelProperty("品牌名称")
private String brandName; // 品牌名称 private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题") @ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题 private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名 private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid") @ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称") @ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称 private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称") @ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称 private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId") @ApiModelProperty("taskId")
private String taskId; // taskId private String taskId; // taskId
} }

26
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("备注") @ApiModelProperty("备注")
private String remarks; // 备注 private String remarks; // 备注
@ApiModelProperty("品牌sid") @ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称") @ApiModelProperty("品牌名称")
private String brandName; // 品牌名称 private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题") @ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题 private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名 private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid") @ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称") @ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称 private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称") @ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称 private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId") @ApiModelProperty("taskId")
private String taskId; // taskId private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传回款返利信息") @ApiModelProperty("本月核对本月已上传回款返利信息")

26
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 private String createBySid; // 创建人sid
@ApiModelProperty("备注") @ApiModelProperty("备注")
private String remarks; // 备注 private String remarks; // 备注
@ApiModelProperty("品牌sid") @ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称") @ApiModelProperty("品牌名称")
private String brandName; // 品牌名称 private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题") @ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题 private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名 private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid") @ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称") @ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称 private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称") @ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称 private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId") @ApiModelProperty("taskId")
private String taskId; // taskId private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传回款返利信息") @ApiModelProperty("本月核对本月已上传回款返利信息")

4
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") @PostMapping("/save")
@ResponseBody @ResponseBody
public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto); public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto);
@ApiOperation("根据sid删除记录") @ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
@ResponseBody @ResponseBody
public ResultBean delBySids(@RequestBody String[] sids); public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody @ResponseBody

36
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 @Component
public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollectionrebateCheckapplyFeign { public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollectionrebateCheckapplyFeign {
@Override @Override
public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq){ public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/listPage无法访问"); return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/listPage无法访问");
} }
@Override @Override
public ResultBean save(ScmCollectionrebateCheckapplyDto dto){ public ResultBean save(ScmCollectionrebateCheckapplyDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/save无法访问"); return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/save无法访问");
} }
@Override @Override
public ResultBean delBySids( String[] sids){ public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/delBySids无法访问"); return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapply/delBySids无法访问");
} }
@Override @Override
public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid){ public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问"); return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问");
} }
} }

6
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 = "回款返利核对申请表 查询条件") @ApiModel(value = "回款返利核对申请表 查询条件", description = "回款返利核对申请表 查询条件")
public class ScmCollectionrebateCheckapplyQuery implements Query { public class ScmCollectionrebateCheckapplyQuery implements Query {
@ApiModelProperty("品牌sid") @ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid private String brandSid; // 品牌sid
@ApiModelProperty("核对申请标题") @ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题 private String checkApply; // 核对申请标题
@ApiModelProperty(value = "创建开始日期") @ApiModelProperty(value = "创建开始日期")
private String createStartTime; private String createStartTime;
@ApiModelProperty(value = "创建结束日期") @ApiModelProperty(value = "创建结束日期")
private String createEndTime; private String createEndTime;
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid private String createOrgSid; // 创建组织sid
} }

26
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 private String sid; // sid
@ApiModelProperty("品牌sid") @ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称") @ApiModelProperty("品牌名称")
private String brandName; // 品牌名称 private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题") @ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题 private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名") @ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名 private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid") @ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称") @ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称 private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid") @ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称") @ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称 private String createOrgName; // 创建组织名称
@ApiModelProperty("回款金额") @ApiModelProperty("回款金额")
private String collectionMoney; // 回款金额 private String collectionMoney; // 回款金额
@ -75,15 +75,15 @@ public class ScmCollectionrebateCheckapplyVo implements Vo {
private String uploadMoney; // 上传金额 private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额") @ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额 private String adjustmentMoney; // 调整金额
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id") @ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid") @ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid") @ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId") @ApiModelProperty("taskId")
private String taskId; // taskId private String taskId; // taskId
} }

4
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 { public class ScmCollectionrebateCheckapplydetail extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("回款返利sid") @ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("核对申请sid") @ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid private String mainSid; // 核对申请sid
} }

4
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 private String sid; // sid
@ApiModelProperty("回款返利sid") @ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("核对申请sid") @ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid private String mainSid; // 核对申请sid
} }

2
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") @ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("核对申请sid") @ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid private String mainSid; // 核对申请sid
} }

4
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") @PostMapping("/save")
@ResponseBody @ResponseBody
public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto); public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto);
@ApiOperation("根据sid删除记录") @ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
@ResponseBody @ResponseBody
public ResultBean delBySids(@RequestBody String[] sids); public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody @ResponseBody

36
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 @Component
public class ScmCollectionrebateCheckapplydetailFeignFallback implements ScmCollectionrebateCheckapplydetailFeign { public class ScmCollectionrebateCheckapplydetailFeignFallback implements ScmCollectionrebateCheckapplydetailFeign {
@Override @Override
public ResultBean<PagerVo<ScmCollectionrebateCheckapplydetailVo>> listPage(PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq){ public ResultBean<PagerVo<ScmCollectionrebateCheckapplydetailVo>> listPage(PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问"); return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/listPage无法访问");
} }
@Override @Override
public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto){ public ResultBean save(ScmCollectionrebateCheckapplydetailDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问"); return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/save无法访问");
} }
@Override @Override
public ResultBean delBySids( String[] sids){ public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问"); return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/delBySids无法访问");
} }
@Override @Override
public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(String sid){ public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问"); return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapplydetail/fetchDetailsBySid无法访问");
} }
} }

4
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 = "回款返利核对申请表_返利列表 查询条件") @ApiModel(value = "回款返利核对申请表_返利列表 查询条件", description = "回款返利核对申请表_返利列表 查询条件")
public class ScmCollectionrebateCheckapplydetailQuery implements Query { public class ScmCollectionrebateCheckapplydetailQuery implements Query {
@ApiModelProperty("回款返利sid") @ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("核对申请sid") @ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid private String mainSid; // 核对申请sid
} }

4
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 private String sid; // sid
@ApiModelProperty("回款返利sid") @ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("核对申请sid") @ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid private String mainSid; // 核对申请sid
} }

32
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<ScmCollection
if (StringUtils.isNotBlank(query.getCollectionTypeKey())){ if (StringUtils.isNotBlank(query.getCollectionTypeKey())){
qw.eq("collectionTypeKey",query.getCollectionTypeKey()); qw.eq("collectionTypeKey",query.getCollectionTypeKey());
} }
if (StringUtils.isNotBlank(query.getCollectionDate())){ String collectionStartDate = query.getCollectionStartDate();
qw.like("collectionDate",query.getCollectionDate()); String collectionEndDate = query.getCollectionEndDate();
} qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). 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<ScmCollection
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey()); qw.eq("collectionTypeKey", query.getCollectionTypeKey());
} }
if (StringUtils.isNotBlank(query.getCollectionDate())){ String collectionStartDate = query.getCollectionStartDate();
qw.like("collectionDate",query.getCollectionDate()); String collectionEndDate = query.getCollectionEndDate();
} qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). 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<ScmCollection
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey()); qw.eq("collectionTypeKey", query.getCollectionTypeKey());
} }
if (StringUtils.isNotBlank(query.getCollectionDate())){ String collectionStartDate = query.getCollectionStartDate();
qw.like("collectionDate",query.getCollectionDate()); String collectionEndDate = query.getCollectionEndDate();
} qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). 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<ScmCollection
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey()); qw.eq("collectionTypeKey", query.getCollectionTypeKey());
} }
if (StringUtils.isNotBlank(query.getCollectionDate())){ String collectionStartDate = query.getCollectionStartDate();
qw.like("collectionDate",query.getCollectionDate()); String collectionEndDate = query.getCollectionEndDate();
} qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").

14
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 @Mapper
public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper<ScmCollectionrebateCheckapply> { public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper<ScmCollectionrebateCheckapply> {
//@Update("update scm_collectionrebate_checkapply set name=#{msg} where id=#{id}") IPage<ScmCollectionrebateCheckapplyVo> selectPageVo(IPage<ScmCollectionrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
//IPage<ScmCollectionrebateCheckapplyVo> voPage(IPage<ScmCollectionrebateCheckapply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionrebateCheckapply> qw);
List<ScmCollectionrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
IPage<ScmCollectionrebateCheckapplyVo> selectPageVo(IPage<ScmCollectionrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
List<ScmCollectionrebateCheckapplyVo> selectListVo();
List<ScmCollectionrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
@Select("select * from scm_collectionrebate_checkapply")
List<ScmCollectionrebateCheckapplyVo> selectListVo();
} }

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml

@ -29,4 +29,10 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="selectListVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
SELECT *
FROM scm_collectionrebate_checkapply
</select>
</mapper> </mapper>

63
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 org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
@ -55,44 +56,44 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCh
* @since 1.0 * @since 1.0
*/ */
@Api(tags = "回款返利核对申请表") @Api(tags = "回款返利核对申请表")
@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyRest") @RestController
@RequestMapping("v1/scmcollectionrebatecheckapply") @RequestMapping("v1/scmcollectionrebatecheckapply")
public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateCheckapplyFeign { public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateCheckapplyFeign {
@Autowired @Autowired
private ScmCollectionrebateCheckapplyService scmCollectionrebateCheckapplyService; private ScmCollectionrebateCheckapplyService scmCollectionrebateCheckapplyService;
@Override @Override
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionrebateCheckapplyQuery> pq){ public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionrebateCheckapplyVo> pv = scmCollectionrebateCheckapplyService.listPageVo(pq); PagerVo<ScmCollectionrebateCheckapplyVo> pv = scmCollectionrebateCheckapplyService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@Override @Override
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto){ public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto) {
return scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto); return scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto);
} }
@Override @Override
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids") @PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){ public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
scmCollectionrebateCheckapplyService.delBySids(sids); scmCollectionrebateCheckapplyService.delBySids(sids);
return rb.success(); return rb.success();
} }
@Override @Override
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid); ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
} }

242
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 @Service
public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<ScmCollectionrebateCheckapplyMapper, ScmCollectionrebateCheckapply> { public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<ScmCollectionrebateCheckapplyMapper, ScmCollectionrebateCheckapply> {
@Autowired @Autowired
private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService; private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService;
private QueryWrapper<ScmCollectionrebateCheckapply> createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) { private QueryWrapper<ScmCollectionrebateCheckapply> createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>(); QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>();
return qw; return qw;
} }
public PagerVo<ScmCollectionrebateCheckapplyVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) { public PagerVo<ScmCollectionrebateCheckapplyVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) {
ScmCollectionrebateCheckapplyQuery query = pq.getParams(); ScmCollectionrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>(); QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) { if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("ssc.brandSid", query.getBrandSid()); qw.eq("ssc.brandSid", query.getBrandSid());
} }
if (StringUtils.isNotBlank(query.getCheckApply())) { if (StringUtils.isNotBlank(query.getCheckApply())) {
qw.like("ssc.checkApply", query.getCheckApply()); qw.like("ssc.checkApply", query.getCheckApply());
} }
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). 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')" apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
); );
qw.eq("ssc.createOrgSid", query.getCreateOrgSid()); qw.eq("ssc.createOrgSid", query.getCreateOrgSid());
IPage<ScmCollectionrebateCheckapply> page = PagerUtil.queryToPage(pq); IPage<ScmCollectionrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw); IPage<ScmCollectionrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmCollectionrebateCheckapplyVo> records = pagging.getRecords(); List<ScmCollectionrebateCheckapplyVo> records = pagging.getRecords();
for (ScmCollectionrebateCheckapplyVo record : records) { for (ScmCollectionrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf("."))); record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf("."))); record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf(".")));
record.setCollectionMoney(record.getCollectionMoney().substring(0,record.getCollectionMoney().lastIndexOf("."))); record.setCollectionMoney(record.getCollectionMoney().substring(0, record.getCollectionMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf("."))); record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf(".")));
} }
PagerVo<ScmCollectionrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<ScmCollectionrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){ public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
List<ScmCollectionrebateCheckapplydetailDto> scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails(); List<ScmCollectionrebateCheckapplydetailDto> scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails();
List<ScmCollectionrebateCheckapplydetailDto> scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails(); List<ScmCollectionrebateCheckapplydetailDto> scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails();
if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) { if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) {
return rb.setMsg("请选择已核对回款返利信息"); return rb.setMsg("请选择已核对回款返利信息");
} }
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData(); String sid = this.insertByDto(dto).getData();
if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(sid); scmCollectionrebateCheckapplydetail1.setMainSid(sid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
} }
} }
} }
if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(sid); scmCollectionrebateCheckapplydetail1.setMainSid(sid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
} }
} }
} }
return rb.success().setMsg("添加成功").setData(sid); return rb.success().setMsg("添加成功").setData(sid);
} }
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dtoSid); ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dtoSid);
if (scmCollectionrebateCheckapply == null) { if (scmCollectionrebateCheckapply == null) {
return rb.setMsg("该核对申请单不存在"); return rb.setMsg("该核对申请单不存在");
} }
this.updateByDto(dto); this.updateByDto(dto);
scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid); scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid);
if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
} }
} }
} }
if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
} }
} }
} }
return rb.success().setMsg("修改成功").setData(dtoSid); return rb.success().setMsg("修改成功").setData(dtoSid);
} }
public ResultBean<String> insertByDto(ScmCollectionrebateCheckapplyDto dto){ public ResultBean<String> insertByDto(ScmCollectionrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply(); ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交"); entity.setNodeState("待提交");
baseMapper.insert(entity); baseMapper.insert(entity);
return rb.success().setData(entity.getSid()); return rb.success().setData(entity.getSid());
} }
public void updateByDto(ScmCollectionrebateCheckapplyDto dto){ public void updateByDto(ScmCollectionrebateCheckapplyDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
ScmCollectionrebateCheckapply entity = fetchBySid(dtoSid); ScmCollectionrebateCheckapply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid){ public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid) {
ScmCollectionrebateCheckapply entity = fetchBySid(sid); ScmCollectionrebateCheckapply entity = fetchBySid(sid);
ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo(); ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
return vo; return vo;
} }
} }

5
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 @Mapper
public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<ScmCollectionrebateCheckapplydetail> { public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<ScmCollectionrebateCheckapplydetail> {
//@Update("update scm_collectionrebate_checkapplydetail set name=#{msg} where id=#{id}")
//IPage<ScmCollectionrebateCheckapplydetailVo> voPage(IPage<ScmCollectionrebateCheckapplydetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionrebateCheckapplydetail> qw);
IPage<ScmCollectionrebateCheckapplydetailVo> selectPageVo(IPage<ScmCollectionrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapplydetail> qw); IPage<ScmCollectionrebateCheckapplydetailVo> selectPageVo(IPage<ScmCollectionrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapplydetail> qw);
List<ScmCollectionrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapplydetail> qw); List<ScmCollectionrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapplydetail> qw);
@Select("select * from scm_collectionrebate_checkapplydetail")
List<ScmCollectionrebateCheckapplydetailVo> selectListVo(); List<ScmCollectionrebateCheckapplydetailVo> selectListVo();
@Delete("delete from scm_collectionrebate_checkapplydetail where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid); void delByMainSid(String dtoSid);
} }

38
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.xml

@ -1,13 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailMapper"> <mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo"> <select id="selectPageVo"
SELECT * FROM scm_collectionrebate_checkapplydetail <where> ${ew.sqlSegment} </where> resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo">
</select> SELECT * FROM scm_collectionrebate_checkapplydetail
<where>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo"> ${ew.sqlSegment}
SELECT * FROM scm_collectionrebate_checkapplydetail <where> ${ew.sqlSegment} </where> </where>
</select> </select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo">
SELECT * FROM scm_collectionrebate_checkapplydetail
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo">
SELECT *
FROM scm_collectionrebate_checkapplydetail
</select>
<delete id="delByMainSid">
DELETE
FROM scm_collectionrebate_checkapplydetail
WHERE mainSid = #{dtoSid}
</delete>
</mapper> </mapper>

2
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 * @since 1.0
*/ */
@Api(tags = "回款返利核对申请表_返利列表") @Api(tags = "回款返利核对申请表_返利列表")
@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailRest") @RestController
@RequestMapping("v1/scmcollectionrebatecheckapplydetail") @RequestMapping("v1/scmcollectionrebatecheckapplydetail")
public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionrebateCheckapplydetailFeign { public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionrebateCheckapplydetailFeign {

88
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 @Service
public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseService<ScmCollectionrebateCheckapplydetailMapper, ScmCollectionrebateCheckapplydetail> { public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseService<ScmCollectionrebateCheckapplydetailMapper, ScmCollectionrebateCheckapplydetail> {
private QueryWrapper<ScmCollectionrebateCheckapplydetail> createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery query) { private QueryWrapper<ScmCollectionrebateCheckapplydetail> createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery query) {
// todo: 这里根据具体业务调整查询条件 QueryWrapper<ScmCollectionrebateCheckapplydetail> qw = new QueryWrapper<>();
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); return qw;
QueryWrapper<ScmCollectionrebateCheckapplydetail> qw = new QueryWrapper<>(); }
return qw;
} public PagerVo<ScmCollectionrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq) {
ScmCollectionrebateCheckapplydetailQuery query = pq.getParams();
public PagerVo<ScmCollectionrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq) { QueryWrapper<ScmCollectionrebateCheckapplydetail> qw = createQueryWrapper(query);
ScmCollectionrebateCheckapplydetailQuery query = pq.getParams(); IPage<ScmCollectionrebateCheckapplydetail> page = PagerUtil.queryToPage(pq);
QueryWrapper<ScmCollectionrebateCheckapplydetail> qw = createQueryWrapper(query); IPage<ScmCollectionrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw);
IPage<ScmCollectionrebateCheckapplydetail> page = PagerUtil.queryToPage(pq); PagerVo<ScmCollectionrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null);
IPage<ScmCollectionrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw); return p;
PagerVo<ScmCollectionrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null); }
return p;
} public void saveOrUpdateDto(ScmCollectionrebateCheckapplydetailDto dto) {
public void saveOrUpdateDto(ScmCollectionrebateCheckapplydetailDto dto){
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto); this.insertByDto(dto);
return; return;
} }
this.updateByDto(dto); this.updateByDto(dto);
} }
public void insertByDto(ScmCollectionrebateCheckapplydetailDto dto){ public void insertByDto(ScmCollectionrebateCheckapplydetailDto dto) {
ScmCollectionrebateCheckapplydetail entity = new ScmCollectionrebateCheckapplydetail(); ScmCollectionrebateCheckapplydetail entity = new ScmCollectionrebateCheckapplydetail();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity); baseMapper.insert(entity);
} }
public void updateByDto(ScmCollectionrebateCheckapplydetailDto dto){ public void updateByDto(ScmCollectionrebateCheckapplydetailDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
ScmCollectionrebateCheckapplydetail entity = fetchBySid(dtoSid); ScmCollectionrebateCheckapplydetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public ScmCollectionrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid){ public ScmCollectionrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid) {
ScmCollectionrebateCheckapplydetail entity = fetchBySid(sid); ScmCollectionrebateCheckapplydetail entity = fetchBySid(sid);
ScmCollectionrebateCheckapplydetailDetailsVo vo = new ScmCollectionrebateCheckapplydetailDetailsVo(); ScmCollectionrebateCheckapplydetailDetailsVo vo = new ScmCollectionrebateCheckapplydetailDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
return vo; return vo;
} }
public void delByMainSid(String dtoSid) { public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid); baseMapper.delByMainSid(dtoSid);
} }
} }
Loading…
Cancel
Save