yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
God 3 years ago
parent
db6d9dcb8c
commit
226dda9ffb
14 changed files with 262 additions and 251 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java
  2. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java
  3. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java
  4. 36
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java
  5. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java
  6. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
  7. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
  8. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java
  9. 100
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
  10. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
  11. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
  12. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
  13. 90
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
  14. 145
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java
View File

@ -50,9 +50,9 @@ import lombok.Data;
public class ScmCollectionRebateWith extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("回款返利sid")
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利预提申请sid")
@ApiModelProperty("回款返利预提申请sid")
private String mainSid; // 回款返利预提申请sid
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java
View File

@ -55,9 +55,9 @@ public class ScmCollectionRebateWithDto implements Dto {
@ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("回款返利sid")
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利预提申请sid")
@ApiModelProperty("回款返利预提申请sid")
private String mainSid; // 回款返利预提申请sid
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java
View File

@ -65,12 +65,12 @@ public interface ScmCollectionRebateWithFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmCollectionRebateWithDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody

36
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java
View File

@ -48,25 +48,25 @@ import java.util.List;
@Component
public class ScmCollectionRebateWithFeignFallback implements ScmCollectionRebateWithFeign {
@Override
public ResultBean<PagerVo<ScmCollectionRebateWithVo>> listPage(PagerQuery<ScmCollectionRebateWithQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/listPage无法访问");
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateWithVo>> listPage(PagerQuery<ScmCollectionRebateWithQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/listPage无法访问");
}
@Override
public ResultBean save(ScmCollectionRebateWithDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/save无法访问");
}
@Override
public ResultBean save(ScmCollectionRebateWithDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/delBySids无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewith/delBySids无法访问");
}
@Override
public ResultBean<ScmCollectionRebateWithDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<ScmCollectionRebateWithDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/fetchDetailsBySid无法访问");
}
}

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java
View File

@ -50,31 +50,31 @@ import lombok.Data;
public class ScmCollectionRebateWithApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty("创建人姓名")
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
}

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
View File

@ -58,31 +58,31 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
private String createBySid; // 申请人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty("创建人姓名")
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("回款返利预提列表")
private List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWiths; // 回款返利预提列表

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
View File

@ -56,33 +56,33 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人姓名")
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("回款返利预提列表")
private List<ScmCollectionRebateWithDto> scmCollectionRebateWiths; // 回款返利预提列表

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java
View File

@ -73,12 +73,12 @@ public interface ScmCollectionRebateWithApplyFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody

100
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
View File

@ -53,65 +53,65 @@ import java.util.List;
@Component
public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionRebateWithApplyFeign {
@Override
public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(PagerQuery<ScmCollectionRebateWithApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/listPage无法访问");
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/listPage无法访问");
}
@Override
public ResultBean save(ScmCollectionRebateWithApplyDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/save无法访问");
}
@Override
public ResultBean save(ScmCollectionRebateWithApplyDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/delBySids无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatewithapply/delBySids无法访问");
}
@Override
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
return null;
}
@Override
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
return null;
}
@Override
public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
return null;
}
@Override
public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
return null;
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
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>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
View File

@ -49,14 +49,14 @@ import lombok.Data;
@ApiModel(value = "回款返利预提申请表 查询条件", description = "回款返利预提申请表 查询条件")
public class ScmCollectionRebateWithApplyQuery implements Query {
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("回款申请标题")
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty(value = "创建开始日期")
private String createStartTime;
@ApiModelProperty(value = "创建结束日期")
private String createEndTime;
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
}

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
View File

@ -57,31 +57,31 @@ public class ScmCollectionRebateWithApplyVo implements Vo {
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty("创建人姓名")
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
@ApiModelProperty("环节定义的sid")
private String nodeSid; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
@ApiModelProperty("taskId")
private String taskId; // taskId
}

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
View File

@ -54,17 +54,13 @@ import java.util.Map;
@Mapper
public interface ScmCollectionRebateWithApplyMapper extends BaseMapper<ScmCollectionRebateWithApply> {
//@Update("update scm_collection_rebate_with_apply set name=#{msg} where id=#{id}")
//IPage<ScmCollectionRebateWithApplyVo> voPage(IPage<ScmCollectionRebateWithApply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionRebateWithApply> qw);
IPage<ScmCollectionRebateWithApplyVo> selectPageVo(IPage<ScmCollectionRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWithApply> qw);
List<ScmCollectionRebateWithApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWithApply> qw);
@Select("select * from scm_collection_rebate_with_apply")
List<ScmCollectionRebateWithApplyVo> selectListVo();
IPage<ScmCollectionRebateWithApplyVo> selectPageVo(IPage<ScmCollectionRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWithApply> qw);
int selectBySid(String join);
List<ScmCollectionRebateWithApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWithApply> qw);
List<ScmCollectionRebateWithApplyVo> selectListVo();
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> beanToMap);
}

90
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
View File

@ -1,46 +1,60 @@
<?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">
<mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
SELECT
scrwa.*,
SUM(scr.`estimateRebate`) withRebateTotal
FROM
scm_collection_rebate_with_apply scrwa
LEFT JOIN scm_collection_rebate_with scrw
ON scrwa.`sid` = scrw.`mainSid`
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = scrw.`collectionRebateSid`
<where>
${ew.sqlSegment}
</where> <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
SELECT * FROM scm_collection_rebate_with_apply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
SELECT
scrwa.*,
SUM(scr.`estimateRebate`) withRebateTotal
FROM
scm_collection_rebate_with_apply scrwa
LEFT JOIN scm_collection_rebate_with scrw
ON scrwa.`sid` = scrw.`mainSid`
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = scrw.`collectionRebateSid`
<where>
${ew.sqlSegment}
</where>
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM scm_collection_rebate_with_apply
WHERE nodeState != '待提交'
<select id="selectListAllVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
SELECT * FROM scm_collection_rebate_with_apply
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM scm_collection_rebate_with_apply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</select>
<update id="updateFlowFiled">
UPDATE scm_collection_rebate_with_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
<update id="updateFlowFiled">
UPDATE scm_collection_rebate_with_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
</update>
<select id="selectListVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
select *
from scm_collection_rebate_with_apply
</select>
</mapper>

145
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
View File

@ -42,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
@ -67,79 +68,79 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
@RequestMapping("v1/scmcollectionrebatewithapply")
public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWithApplyFeign {
@Autowired
private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateWithApplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateWithApplyVo> pv = scmCollectionRebateWithApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto){
return scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@Autowired
private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateWithApplyVo> pv = scmCollectionRebateWithApplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto) {
return scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return scmCollectionRebateWithApplyService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return scmCollectionRebateWithApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid);
}
@Override
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
return scmCollectionRebateWithApplyService.submitCollectionRebateWithApply(dto);
}
@Override
public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
return scmCollectionRebateWithApplyService.complete(bv);
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.revokeProcess(flowTaskVo);
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.taskReject(flowTaskVo);
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.breakProcess(flowTaskVo);
}
@Override
public ResultBean flowRecord(String procInsId) {
return scmCollectionRebateWithApplyService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return scmCollectionRebateWithApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return scmCollectionRebateWithApplyService.getPreviousNodesForReject(query);
}
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid);
}
@Override
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
return scmCollectionRebateWithApplyService.submitCollectionRebateWithApply(dto);
}
@Override
public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
return scmCollectionRebateWithApplyService.complete(bv);
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.revokeProcess(flowTaskVo);
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.taskReject(flowTaskVo);
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.breakProcess(flowTaskVo);
}
@Override
public ResultBean flowRecord(String procInsId) {
return scmCollectionRebateWithApplyService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return scmCollectionRebateWithApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return scmCollectionRebateWithApplyService.getPreviousNodesForReject(query);
}
}

Write Preview
Loading…
Cancel
Save