Browse Source

专项返利核对接口开发

master
God 3 years ago
parent
commit
414d253fb4
  1. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java
  2. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java
  3. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java
  4. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java
  5. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java
  6. 50
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateSpecialAdjDto.java
  7. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
  8. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java
  9. 12
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java
  10. 43
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java
  11. 45
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java
  12. 31
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java
  13. 43
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java
  14. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/GetNodeQuery.java
  15. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/GetNodeVo.java
  16. 42
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyCompleteDto.java
  17. 56
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyTaskQuery.java
  18. 21
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/SubmitScmSpecialRebateCheckApplyDto.java
  19. 32
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java
  20. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java
  21. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
  22. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
  23. 38
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  24. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java
  25. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml
  26. 59
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  27. 221
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  28. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java
  29. 38
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
  30. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
  31. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java

@ -64,8 +64,6 @@ public class ScmSpecialRebate extends BaseEntity {
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@ -73,8 +73,6 @@ public class ScmSpecialRebateDetailsVo implements Vo {
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java

@ -51,6 +51,10 @@ public class ScmSpecialRebateDto implements Dto {
private String sid; // sid
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -65,8 +69,6 @@ public class ScmSpecialRebateDto implements Dto {
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java

@ -63,6 +63,11 @@ public interface ScmSpecialRebateFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmSpecialRebateDto dto);
@ApiOperation("调整")
@PostMapping("/adjustment")
@ResponseBody
public ResultBean adjustment(@RequestBody ScmSpecialRebateSpecialAdjDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java

@ -59,6 +59,11 @@ public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/save无法访问");
}
@Override
public ResultBean adjustment(ScmSpecialRebateSpecialAdjDto dto) {
return null;
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/delBySids无法访问");

50
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateSpecialAdjDto.java

@ -0,0 +1,50 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebate;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "专项返利表 数据传输对象", description = "专项返利表 数据传输对象")
public class ScmSpecialRebateSpecialAdjDto implements Dto {
private String sid; // sid
@ApiModelProperty("二次上传日期")
private String secondaryUploadDate; // 二次上传日期
@ApiModelProperty("二次上传金额")
private String secondaryUploadMoney; // 二次上传金额
@ApiModelProperty("待确定金额")
private String stayDetermineMoney; // 待确定金额
@ApiModelProperty("费用")
private String cost; // 费用
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@ -73,12 +73,10 @@ public class ScmSpecialRebateVo implements Vo {
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("所属年月(页面展示)")
private String palceGenDateCopy; // 所属年月(页面展示)
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("预提日期(页面展示)")
private String withholdingDateCopy; // 预提日期(页面展示)
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java

@ -26,12 +26,17 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplyVo.java <br/>
@ -51,6 +56,7 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -78,4 +84,8 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails; // 本月核对本月已上传专项返利信息
@ApiModelProperty("本月核对往月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDetailsVo> scmLastSpecialrebateCheckapplydetailDetails; // 本月核对往月已上传专项返利信息
}

12
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplyDto.java <br/>
@ -51,6 +54,10 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -77,5 +84,8 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDto> scmWhenSpecialrebateCheckapplydetailDetails; // 本月核对本月已上传专项返利信息
@ApiModelProperty("本月核对往月已上传专项返利信息")
private List<ScmSpecialrebateCheckapplydetailDto> scmLastSpecialrebateCheckapplydetailDetails; // 本月核对往月已上传专项返利信息
}

43
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java

@ -25,14 +25,22 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
@ -75,4 +83,39 @@ public interface ScmSpecialrebateCheckapplyFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
/**************************************专项返利核对审批流程*******************************************/
@ApiOperation("提交专项返利核对申请")
@PostMapping("/submitSpecialRebateCheckApply")
public ResultBean submitSpecialRebateCheckApply(@RequestBody @Valid SubmitScmSpecialRebateCheckApplyDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody ScmSpecialRebateCheckApplyCompleteDto dto);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
@ApiOperation(value = "流程历史流转记录")
@GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
}

45
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java

@ -25,6 +25,11 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -69,4 +74,44 @@ public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebate
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
return null;
}
@Override
public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) {
return null;
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
}

31
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java

@ -49,31 +49,18 @@ import lombok.Data;
@ApiModel(value = "专项返利核对申请表 查询条件", description = "专项返利核对申请表 查询条件")
public class ScmSpecialrebateCheckapplyQuery implements Query {
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
}

43
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplyVo.java <br/>
@ -51,31 +54,31 @@ public class ScmSpecialrebateCheckapplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("待确定金额")
private String stayDetermineMoney; // 待确定金额
@ApiModelProperty("费用")
private String money; // 费用
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/GetNodeQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 10:42
* @Description
*/
@Data
public class GetNodeQuery implements Query {
private static final long serialVersionUID = -5674867230708197611L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/GetNodeVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/28 11:09
* @Description
*/
@Data
public class GetNodeVo implements Vo {
private static final long serialVersionUID = 8802774014747063504L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

42
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyCompleteDto.java

@ -0,0 +1,42 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.HashMap;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 9:01
* @Description
*/
@Data
public class ScmSpecialRebateCheckApplyCompleteDto implements Dto {
private static final long serialVersionUID = 3240453987322803352L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@NotBlank(message = "参数错误:orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
// @NotBlank(message = "参数错误:comment")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables = new HashMap<>();
}

56
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyTaskQuery.java

@ -0,0 +1,56 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/6/28 17:29
* @Description 终止撤回驳回查询参数
*/
@Data
public class ScmSpecialRebateCheckApplyTaskQuery implements Query {
private static final long serialVersionUID = -4006020771892400451L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
/*@ApiModelProperty("用户Id")
private String userId;
@ApiModelProperty("节点")
private String targetKey;
@ApiModelProperty("流程变量信息")
private Map<String, Object> values = new HashMap<>();
@ApiModelProperty("审批人")
private String assignee;
@ApiModelProperty("候选人")
private List<String> candidateUsers = new ArrayList<>();
@ApiModelProperty("审批组")
private List<String> candidateGroups = new ArrayList<>();*/
}

21
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/SubmitScmSpecialRebateCheckApplyDto.java

@ -0,0 +1,21 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/6/27 13:38
* @Description
*/
@Data
public class SubmitScmSpecialRebateCheckApplyDto extends ScmSpecialrebateCheckapplyDto {
private static final long serialVersionUID = 378585162071125756L;
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

32
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplydetailVo.java <br/>
@ -51,9 +53,35 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("专项返利sid")
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("预提日期(页面展示)")
private String withholdingDateCopy; // 预提日期(页面展示)
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("预提数量")
private String withholdingAmount; // 预提数量
@ApiModelProperty("上传数量")
private String uploadAmount; // 上传数量
@ApiModelProperty("预提金额")
private String withRebate; // 预提金额
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("待确定金额")
private String stayDetermineMoney; // 待确定金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("费用")
private String money; // 费用
@ApiModelProperty("专项返利sid")
private String specialRebateSid; // 专项返利sid
@ApiModelProperty("核对申请sid")
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid
@ApiModelProperty("专项返利sid")
private List<String> specialRebateSids; // 专项返利sid
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapplydetailDto.java <br/>
@ -51,8 +53,8 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto {
private String sid; // sid
@ApiModelProperty("专项返利sid")
private String specialRebateSid; // 专项返利sid
@ApiModelProperty("专项返利sid")
private List<String> specialRebateSids; // 专项返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@ -66,4 +66,7 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
@Update("update scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
void updateState(String specialRebateSid);
@Update("update scm_special_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{sid}")
void updateWithholdingDateBySid(String sid);
}

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmspecialrebate;
import com.yxt.anrui.scm.api.scmspecialrebate.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -33,12 +34,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDto;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateFeign;
/**
* Project: anrui-scm(专项返利管理) <br/>
* File: ScmSpecialRebateFeignFallback.java <br/>
@ -78,6 +73,11 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
return rb.success();
}
@Override
public ResultBean adjustment(ScmSpecialRebateSpecialAdjDto dto) {
return scmSpecialRebateService.adjustment(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")

38
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@ -29,16 +29,13 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmspecialrebate.*;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDto;
import org.springframework.stereotype.Service;
@ -100,6 +97,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
this.insertByDto(dto);
return;
}
dto.setState("3");
this.updateByDto(dto);
}
@ -220,14 +218,36 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmSpecialRebateVo record : pagging.getRecords()) {
String palceGenDate = record.getPalceGenDate();
Date parse = DateUtil.parse(palceGenDate);
String withholdingDate = record.getWithholdingDate();
Date parse = DateUtil.parse(withholdingDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String palceGenDateCopy = year + "年" + month + "月";
record.setPalceGenDateCopy(palceGenDateCopy);
String withholdingDateCopy = year + "年" + month + "月";
record.setWithholdingDateCopy(withholdingDateCopy);
}
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean adjustment(ScmSpecialRebateSpecialAdjDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
ScmSpecialRebate scmSpecialRebate = fetchBySid(sid);
ScmSpecialRebateDto scmSpecialRebateDto = new ScmSpecialRebateDto();
BeanUtil.copyProperties(scmSpecialRebate,scmSpecialRebateDto);
scmSpecialRebateDto.setSecondaryUploadDate(dto.getSecondaryUploadDate());
scmSpecialRebateDto.setSecondaryUploadMoney(dto.getSecondaryUploadMoney());
scmSpecialRebateDto.setStayDetermineMoney(dto.getStayDetermineMoney());
int mon = Integer.parseInt(scmSpecialRebateDto.getMoney());
int cost = Integer.parseInt(dto.getCost());
String money = String.valueOf(mon + cost);
scmSpecialRebateDto.setMoney(money);
scmSpecialRebateDto.setAdjustmentMoney(dto.getAdjustmentMoney());
updateBySid(scmSpecialRebateDto,sid);
return rb.success().setMsg("调整成功");
}
public void updateWithholdingDateBySid(String sid) {
baseMapper.updateWithholdingDateBySid(sid);
}
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java

@ -62,4 +62,6 @@ public interface ScmSpecialrebateCheckapplyMapper extends BaseMapper<ScmSpecialr
@Select("select * from scm_specialrebate_checkapply")
List<ScmSpecialrebateCheckapplyVo> selectListVo();
int selectBySid(String join);
}

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@ -4,10 +4,32 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
SELECT * FROM scm_specialrebate_checkapply <where> ${ew.sqlSegment} </where>
SELECT
ssc.*,
SUM(ssr.`estimateRebate`) estimateRebate,
SUM(ssr.`uploadMoney`) uploadMoney,
SUM(ssr.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssr.`adjustmentMoney`) adjustmentMoney,
SUM(ssr.`money`) money
FROM
scm_specialrebate_checkapply ssc
LEFT JOIN scm_specialrebate_checkapplydetail sscd
ON ssc.`sid` = sscd.`mainSid`
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = sscd.`specialRebateSid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo">
SELECT * FROM scm_specialrebate_checkapply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM scm_specialrebate_checkapply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</mapper>

59
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@ -25,6 +25,11 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -75,26 +80,60 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto){
ResultBean rb = ResultBean.fireFail();
scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto);
return rb.success();
return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmSpecialrebateCheckapplyService.delBySids(sids);
return rb.success();
return scmSpecialrebateCheckapplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapplyDetailsVo vo = scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
return null;
}
@Override
public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) {
return null;
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
}

221
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@ -26,8 +26,13 @@
package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,8 +46,11 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapp
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
@ -60,51 +68,178 @@ import java.util.List;
*/
@Service
public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpecialrebateCheckapplyMapper, ScmSpecialrebateCheckapply> {
private QueryWrapper<ScmSpecialrebateCheckapply> createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmSpecialrebateCheckapply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmSpecialrebateCheckapplyVo> listPageVo(PagerQuery<ScmSpecialrebateCheckapplyQuery> pq) {
ScmSpecialrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmSpecialrebateCheckapply> qw = createQueryWrapper(query);
IPage<ScmSpecialrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmSpecialrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmSpecialrebateCheckapplyDto dto){
@Autowired
private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
private QueryWrapper<ScmSpecialrebateCheckapply> createQueryWrapper(ScmSpecialrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmSpecialrebateCheckapply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmSpecialrebateCheckapplyVo> listPageVo(PagerQuery<ScmSpecialrebateCheckapplyQuery> pq) {
ScmSpecialrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmSpecialrebateCheckapply> 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<ScmSpecialrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmSpecialrebateCheckapplyVo> records = pagging.getRecords();
for (ScmSpecialrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0,record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0,record.getMoney().lastIndexOf(".")));
}
PagerVo<ScmSpecialrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmSpecialrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmSpecialrebateCheckapplydetailDto> scmWhenSpecialrebateCheckapplydetailDetails = dto.getScmWhenSpecialrebateCheckapplydetailDetails();
List<ScmSpecialrebateCheckapplydetailDto> scmLastSpecialrebateCheckapplydetailDetails = dto.getScmLastSpecialrebateCheckapplydetailDetails();
if (scmWhenSpecialrebateCheckapplydetailDetails.size() < 1 && scmLastSpecialrebateCheckapplydetailDetails.size() < 1) {
return rb.setMsg("请选择已核对专项返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(ScmSpecialrebateCheckapplyDto dto){
ScmSpecialrebateCheckapply entity = new ScmSpecialrebateCheckapply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(ScmSpecialrebateCheckapplyDto dto){
String dtoSid = dto.getSid();
String sid = this.insertByDto(dto).getData();
if (scmWhenSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmWhenSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(sid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
}
if (scmLastSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmLastSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(sid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
}
return rb.success().setMsg("添加成功").setData(sid);
}
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(dtoSid);
if (scmSpecialrebateCheckapply == null) {
return rb.setMsg("该核对申请单不存在");
}
this.updateByDto(dto);
scmSpecialrebateCheckapplydetailService.delByMainSid(dtoSid);
if (scmWhenSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmWhenSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(dtoSid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
}
if (scmLastSpecialrebateCheckapplydetailDetails.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetail : scmLastSpecialrebateCheckapplydetailDetails) {
for (String SpecialRebateSid : scmSpecialrebateCheckapplydetail.getSpecialRebateSids()) {
ScmSpecialrebateCheckapplydetail scmSpecialrebateCheckapplydetail1 = new ScmSpecialrebateCheckapplydetail();
scmSpecialrebateCheckapplydetail1.setSpecialRebateSid(SpecialRebateSid);
scmSpecialrebateCheckapplydetail1.setMainSid(dtoSid);
scmSpecialrebateCheckapplydetailService.save(scmSpecialrebateCheckapplydetail1);
}
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public ResultBean<String> insertByDto(ScmSpecialrebateCheckapplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapply entity = new ScmSpecialrebateCheckapply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmSpecialrebateCheckapplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmSpecialrebateCheckapply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmSpecialrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid){
ScmSpecialrebateCheckapply entity = fetchBySid(sid);
ScmSpecialrebateCheckapplyDetailsVo vo = new ScmSpecialrebateCheckapplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}
ScmSpecialrebateCheckapply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsVoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapplyDetailsVo scmSpecialrebateCheckapplyDetailsVo = new ScmSpecialrebateCheckapplyDetailsVo();
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(sid);
BeanUtil.copyProperties(scmSpecialrebateCheckapply,scmSpecialrebateCheckapplyDetailsVo);
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid);
if (scmWhenSpecialrebateCheckapplydetailDetailsVos.size() > 0){
for (ScmSpecialrebateCheckapplydetailDetailsVo scmWhenSpecialrebateCheckapplydetailDetailsVo : scmWhenSpecialrebateCheckapplydetailDetailsVos) {
String SpecialRebateSid = scmWhenSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid();
String[] SpecialRebateSids = SpecialRebateSid.split(",");
scmWhenSpecialrebateCheckapplydetailDetailsVo.setSpecialRebateSids(Arrays.asList(SpecialRebateSids));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
}
}
scmSpecialrebateCheckapplyDetailsVo.setScmWhenSpecialrebateCheckapplydetailDetails(scmWhenSpecialrebateCheckapplydetailDetailsVos);
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmLastSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid);
if (scmLastSpecialrebateCheckapplydetailDetailsVos.size() > 0){
for (ScmSpecialrebateCheckapplydetailDetailsVo scmLastSpecialrebateCheckapplydetailDetailsVo : scmLastSpecialrebateCheckapplydetailDetailsVos) {
String SpecialRebateSid = scmLastSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid();
String[] SpecialRebateSids = SpecialRebateSid.split(",");
scmLastSpecialrebateCheckapplydetailDetailsVo.setSpecialRebateSids(Arrays.asList(SpecialRebateSids));
scmLastSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
String withholdingDate = scmLastSpecialrebateCheckapplydetailDetailsVo.getWithholdingDate();
Date parse = DateUtil.parse(withholdingDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String withholdingDateCopy = year + "年" + month + "月";
scmLastSpecialrebateCheckapplydetailDetailsVo.setWithholdingDateCopy(withholdingDateCopy);
}
}
scmSpecialrebateCheckapplyDetailsVo.setScmLastSpecialrebateCheckapplydetailDetails(scmLastSpecialrebateCheckapplydetailDetailsVos);
return rb.success().setData(scmSpecialrebateCheckapplyDetailsVo);
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据,删除失败");
}
delBySids(sids);
for (String sid : sids) {
scmSpecialrebateCheckapplydetailService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
}

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java

@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +64,11 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSp
@Select("select * from scm_specialrebate_checkapplydetail")
List<ScmSpecialrebateCheckapplydetailVo> selectListVo();
@Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
void delByMainSid(String sid);
List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
}

38
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@ -10,4 +10,42 @@
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
SELECT * FROM scm_specialrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchWhenDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
SELECT ssr.rebateTypeKey,
ssr.`rebateTypeValue`,
SUM(ssr.`estimateRebate`) withRebate,
COUNT(*) num,
GROUP_CONCAT(ssc.`specialRebateSid`) specialRebateSid,
SUM(ssr.`uploadMoney`) uploadMoney,
SUM(ssr.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssr.`adjustmentMoney`) adjustmentMoney,
SUM(ssr.`money`) money
FROM scm_specialrebate_checkapplydetail ssc
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = ssc.`specialRebateSid`
WHERE ssc.`mainSid` = #{sid}
AND DATE_FORMAT(ssr.withholdingDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY ssr.`rebateTypeKey`
</select>
<select id="fetchLastDetailsVoBySid"
resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
SELECT ssr.withholdingDate,
SUM(ssr.`estimateRebate`) withRebate,
COUNT(*) withholdingAmount,
COUNT(*) uploadAmount,
GROUP_CONCAT(ssc.`specialRebateSid`) specialRebateSid,
SUM(ssr.`uploadMoney`) uploadMoney,
SUM(ssr.`stayDetermineMoney`) stayDetermineMoney,
SUM(ssr.`adjustmentMoney`) adjustmentMoney,
SUM(ssr.`money`) money
FROM scm_specialrebate_checkapplydetail ssc
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = ssc.`specialRebateSid`
WHERE ssc.`mainSid` = #{sid}
AND DATE_FORMAT(ssr.withholdingDate, '%Y%m') != DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY ssr.withholdingDate
</select>
</mapper>

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@ -107,4 +107,16 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String sid) {
baseMapper.delByMainSid(sid);
}
public List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid) {
return baseMapper.fetchWhenDetailsVoBySid(sid);
}
public List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid) {
return baseMapper.fetchLastDetailsVoBySid(sid);
}
}

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@ -255,9 +255,9 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//=====================添加app所需参数
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",businessSid);
variables.put("app",appMap);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -267,10 +267,17 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
//获取专项返利sid
List<ScmSpecialRebateWithDto> scmSpecialRebateWiths = dto.getScmSpecialRebateWiths();
for (ScmSpecialRebateWithDto scmSpecialRebateWith : scmSpecialRebateWiths) {
String specialRebateSid = scmSpecialRebateWith.getSpecialRebateSid();
scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid);
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
}
if (r == 2) {
@ -436,7 +443,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList());
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}

Loading…
Cancel
Save