diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml index eb1aacf865..91f5bc2984 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml @@ -22,7 +22,7 @@ diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java index e65297ade2..013a3ea978 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java @@ -53,6 +53,8 @@ import java.util.Date; public class ScmCollectionRebateWithApply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java index f3f295d5b0..02ff147b52 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java @@ -58,6 +58,8 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo { @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java index 37a322c07d..1cfc5ee92a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java @@ -58,6 +58,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("部门sid") private String deptSid; @ApiModelProperty("部门") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java index f30e87391b..72543e58e9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java @@ -55,14 +55,16 @@ public class ScmCollectionRebateWithApplyQuery implements Query { private String deptName; @ApiModelProperty("创建人姓名") private String createByName; - @ApiModelProperty("回款申请标题") - private String collectionApply; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("创建日期") private String createStartTime; private String createEndTime; @ApiModelProperty("办结日期") private String finishTimeStart; private String finishTimeEnd; + @ApiModelProperty("回款申请标题") + private String collectionApply; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java index 72eb53ced5..67bebf2a68 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java @@ -56,24 +56,24 @@ public class ScmCollectionRebateWithApplyVo implements Vo { @ApiModelProperty("流程状态") private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("分公司") private String useOrgName; - @ApiModelProperty("回款申请标题") - private String collectionApply; - @ApiModelProperty("预提返利") - private String estimateRebate; - @ApiModelProperty("备注") - private String remarks; - @ApiModelProperty("创建人姓名") - private String createByName; @ApiModelProperty("部门") private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; + @ApiModelProperty("回款申请标题") + private String collectionApply; + @ApiModelProperty("预提返利") + private String estimateRebate; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java index 8a2c932825..3310e9fb78 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java @@ -60,12 +60,12 @@ public interface ScmSpecialRebateFeign { @PostMapping("/adjustment") @ResponseBody public ResultBean adjustment(@RequestBody ScmSpecialRebateSpecialAdjDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -98,7 +98,7 @@ public interface ScmSpecialRebateFeign { @ApiOperation(value = "一次导入") @PostMapping("/getExcelOneInfo") @ResponseBody - public ResultBean getExcelOneInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath) throws IOException, ParseException; + public ResultBean getExcelOneInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException; @ApiOperation("二次导出") @PostMapping("/excelListTwo") @@ -107,6 +107,6 @@ public interface ScmSpecialRebateFeign { @ApiOperation(value = "二次导入") @PostMapping("/getExcelTwoInfo") @ResponseBody - public ResultBean getExcelTwoInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request,@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath) throws IOException, ParseException; + public ResultBean getExcelTwoInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index d33eb290e8..c89f416ad9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java @@ -68,27 +68,27 @@ public class ScmSpecialRebateVo implements Vo { @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; @ApiModelProperty("待确定金额(动态)") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java index 74bbfc9195..94cdb33917 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java @@ -50,31 +50,33 @@ import lombok.Data; public class ScmSpecialrebateCheckapply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java index 39485a44ff..2a86f96195 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java @@ -58,38 +58,40 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo { private String sid; // sid - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @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 String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java index 2df0c21833..f4ef82189f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java @@ -58,31 +58,33 @@ public class ScmSpecialrebateCheckapplyDto implements Dto { private String createBySid; // 创建人sid @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") + @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 - @ApiModelProperty("创建人姓名") + @ApiModelProperty("创建人姓名") private String createByName; // 创建人姓名 - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") + @ApiModelProperty("流程状态") private String nodeState; // 流程状态 - @ApiModelProperty("流程定义的id") + @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") + @ApiModelProperty("环节定义的sid") private String nodeSid; // 环节定义的sid - @ApiModelProperty("流程实例的sid") + @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") + @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java index d919a5f29a..52277dbd0f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java @@ -65,7 +65,6 @@ public interface ScmSpecialrebateCheckapplyFeign { @PostMapping("/rePushVoucher") public ResultBean rePushVoucher(@RequestParam("sid") String sid); - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody @@ -75,12 +74,12 @@ public interface ScmSpecialrebateCheckapplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java index 64ae2780fc..e2f10ecd1a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java @@ -51,16 +51,20 @@ public class ScmSpecialrebateCheckapplyQuery implements Query { @ApiModelProperty("分公司") private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建日期") + private String createStartTime; + private String createEndTime; + @ApiModelProperty("办结日期") + private String finishTimeStart; + private String finishTimeEnd; @ApiModelProperty("核对申请标题") - private String checkApply; // 核对申请标题 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 - @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id - @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + private String checkApply; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java index 9015e07a90..863ca67eac 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java @@ -52,35 +52,41 @@ import java.util.Date; @ApiModel(value = "专项返利核对申请表 视图数据对象", description = "专项返利核对申请表 视图数据对象") public class ScmSpecialrebateCheckapplyVo implements Vo { - private String sid; // sid + private String sid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("核对申请标题") - private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") - private String createByName; // 创建人姓名 + private String createByName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // 创建日期 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; + @ApiModelProperty("核对申请标题") + private String checkApply; @ApiModelProperty("预计返利") - private String estimateRebate; // 预计返利 + private String estimateRebate; @ApiModelProperty("其中预提费用") private String withholdCost; @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private String uploadMoney; @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + private String stayDetermineMoney; @ApiModelProperty("费用") - private String money; // 费用 + private String money; @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 - @ApiModelProperty("流程状态") - private String nodeState; // 流程状态 + private String adjustmentMoney; + @ApiModelProperty("流程定义的id") - private String procDefId; // 流程定义的id + private String procDefId; @ApiModelProperty("流程实例的sid") - private String procInstId; // 流程实例的sid + private String procInstId; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java index 0ef42b353f..975cf8cc8d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java @@ -57,6 +57,10 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -88,10 +92,6 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity { @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("采购系统sid") - private String purchaseSystemSid; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; @ApiModelProperty("所属年月") private String palceGenDate; @ApiModelProperty("一次核对状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java index 0f8f6cd254..8d6c1b7c46 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java @@ -53,6 +53,10 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 @ApiModelProperty("预提日期(页面展示)") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java index 68a0d5ed4c..ee592f69ad 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java @@ -59,6 +59,10 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -90,10 +94,6 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto { @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("采购系统sid") - private String purchaseSystemSid; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; @ApiModelProperty("所属年月") private String palceGenDate; @ApiModelProperty("一次核对状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java index 0eec774ec2..d3bba1cb26 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java @@ -57,26 +57,6 @@ import java.util.List; fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class) public interface ScmSpecialrebateCheckapplydetailFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("专项返利核对查看详情") @GetMapping("/specialRebateCheckDetails/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java index d8802c696f..1915e13e4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java @@ -36,28 +36,6 @@ import java.util.List; @Component public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecialrebateCheckapplydetailFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/listPage无法访问"); - } - - @Override - public ResultBean save(ScmSpecialrebateCheckapplydetailDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/fetchDetailsBySid无法访问"); - } - @Override public ResultBean> specialRebateCheckDetails(String sid) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java deleted file mode 100644 index 5fcf7dabb5..0000000000 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java +++ /dev/null @@ -1,57 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail; - - -import com.yxt.common.core.query.Query; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: anrui-scm(专项返利)
- * File: ScmSpecialrebateCheckapplydetailQuery.java
- * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery
- * Description: 专项返利核对申请表_返利列表 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-09-09 09:14:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "专项返利核对申请表_返利列表 查询条件", description = "专项返利核对申请表_返利列表 查询条件") -public class ScmSpecialrebateCheckapplydetailQuery implements Query { - - @ApiModelProperty("专项返利sid") - private String specialRebateSid; // 专项返利sid - @ApiModelProperty("核对申请sid") - private String mainSid; // 核对申请sid - -} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java index 96022b5003..43ca6474aa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java @@ -58,6 +58,10 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo { @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") @@ -89,10 +93,6 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo { @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("采购系统sid") - private String purchaseSystemSid; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; @ApiModelProperty("所属年月") private String palceGenDate; @ApiModelProperty("一次核对状态") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java index 2655520011..ec9f7495e7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java @@ -60,13 +60,13 @@ public class ScmSpecialRebateWithDetailsVo implements Vo { private String withRebate; // 预提返利 @ApiModelProperty("专项返利sid") private List specialRebateSids; // 专项返利sid - @ApiModelProperty("专项返利sid") + @ApiModelProperty("专项返利sid") private String specialRebateSid; // 专项返利sid @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("专项返利预提申请sid") + @ApiModelProperty("专项返利预提申请sid") private String mainSid; // 专项返利预提申请sid @ApiModelProperty("采购系统sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java index b041b3b6fe..f84dea8976 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java @@ -57,26 +57,6 @@ import java.util.List; fallback = ScmSpecialRebateWithFeignFallback.class) public interface ScmSpecialRebateWithFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody ScmSpecialRebateWithDto dto); - - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySids") - @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - @ApiOperation("专项返利预提查看详情") @GetMapping("/specialRebateWithDetails/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java index 3c54e99166..11d672a958 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java @@ -49,28 +49,6 @@ import java.util.List; @Component public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebatewith/listPage无法访问"); - } - - @Override - public ResultBean save(ScmSpecialRebateWithDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatewith/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatewith/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmspecialrebatewith/fetchDetailsBySid无法访问"); - } - @Override public ResultBean> specialRebateWithDetails(String sid) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java index 986401ad39..ac3e22463a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java @@ -50,31 +50,33 @@ import lombok.Data; public class ScmSpecialRebateWithApply extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @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 String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java index f9fb1cacf0..8e745ae280 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java @@ -59,31 +59,33 @@ public class ScmSpecialRebateWithApplyDetailsVo implements Vo { private String createBySid; // 申请人sid @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 - @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 String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java index a81e868cd8..8ed4077022 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java @@ -57,33 +57,35 @@ public class ScmSpecialRebateWithApplyDto implements Dto { @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("单据编号") + private String billNo; @ApiModelProperty("申请部门sid") private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("预提申请") + @ApiModelProperty("预提申请") private String withApply; // 预提申请 @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 String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java index 3e6086e4e3..afa7c34930 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java @@ -65,7 +65,6 @@ public interface ScmSpecialRebateWithApplyFeign { @PostMapping("/rePushVoucher") public ResultBean rePushVoucher(@RequestParam("sid") String sid); - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody @@ -75,12 +74,12 @@ public interface ScmSpecialRebateWithApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java index f272ce05b1..91f4e17e88 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java @@ -51,17 +51,20 @@ public class ScmSpecialRebateWithApplyQuery implements Query { @ApiModelProperty("分公司名称") private String createOrgName; - @ApiModelProperty("预提申请") - private String withApply; // 预提申请 - @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 - @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建开始") + private String createStartTime; + private String createEndTime; @ApiModelProperty("办结日期") private String finishTimeStart; private String finishTimeEnd; - @ApiModelProperty("流程状态") - private String nodeState; + @ApiModelProperty("预提申请") + private String withApply; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java index b25e28ac41..3e0f3f3794 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java @@ -54,26 +54,28 @@ public class ScmSpecialRebateWithApplyVo implements Vo { private String sid; // sid + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("创建人姓名") + private String createByName; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // 创建日期 + private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("办结日期") private Date finishTime; - @ApiModelProperty("申请部门名称") - private String deptName; @ApiModelProperty("预提申请") - private String withApply; // 预提申请 + private String withApply; @ApiModelProperty("预提返利合计") - private Integer withRebateTotal; // 预提返利合计 + private Integer withRebateTotal; @ApiModelProperty("其中预提费用") private String withholdCost; - @ApiModelProperty("创建人姓名") - private String createByName; // 创建人姓名 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("流程状态") - private String nodeState; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的sid") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml index 31b17ca2c6..7bac972547 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml @@ -7,13 +7,13 @@ resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo"> SELECT scrwa.*, - SUM(scr.`estimateRebate`) estimateRebate + SUM(scr.estimateRebate) estimateRebate FROM scm_collection_rebate_with_apply scrwa LEFT JOIN scm_collection_rebate_with scrw - ON scrwa.`sid` = scrw.`mainSid` + ON scrwa.sid = scrw.mainSid LEFT JOIN scm_collection_rebate scr - ON scr.`sid` = scrw.`collectionRebateSid` + ON scr.sid = scrw.collectionRebateSid ${ew.sqlSegment} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java index 5b25524889..d745b903a6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java @@ -162,6 +162,9 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + int selectBySid(String join); int updateFlowFiled(Map beanToMap); + + String selectNum(String billNo); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml index a2fac108d1..41e1bf5ded 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml @@ -31,6 +31,9 @@ UPDATE scm_specialrebate_checkapply SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , finishTime = NOW() + , procDefId=#{procDefId} @@ -42,4 +45,12 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 8a532e10f8..7136ecabfa 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -46,96 +46,96 @@ import java.util.List; @RequestMapping("v1/scmspecialrebatecheckapply") public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckapplyFeign { - @Autowired - private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService; - - @Override - public ResultBean rePushVoucher(String sid) { - ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid,"1"); - return rb.success(); - } - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialrebateCheckapplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto){ - return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService; + + @Override + public ResultBean rePushVoucher(String sid) { + ResultBean rb = ResultBean.fireFail(); + scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1"); + return rb.success(); + } + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmSpecialrebateCheckapplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto) { + return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return scmSpecialrebateCheckapplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return scmSpecialrebateCheckapplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid); - } - - @Override - public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) { - return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto); - } - - @Override - public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); - return scmSpecialrebateCheckapplyService.complete(bv); - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo); - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo); - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo); - } - - @Override - public ResultBean flowRecord(String procInsId) { - return scmSpecialrebateCheckapplyService.flowRecord(procInsId); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) { - return scmSpecialrebateCheckapplyService.delegate(query); - } - - @Override - public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) { - return scmSpecialrebateCheckapplyService.assignTask(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) { + return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto); + } + + @Override + public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + return scmSpecialrebateCheckapplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmSpecialrebateCheckapplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) { + return scmSpecialrebateCheckapplyService.delegate(query); + } + + @Override + public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) { + return scmSpecialrebateCheckapplyService.assignTask(query); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 568a7d9577..5461f29fcc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -149,6 +151,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String finishTimeStart = query.getFinishTimeStart(); + String finishTimeEnd = query.getFinishTimeEnd(); + qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (ssc.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (ssc.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" + ); qw.groupBy("ssc.sid"); qw.orderByDesc("ssc.createTime"); IPage page = PagerUtil.queryToPage(pq); @@ -173,6 +189,18 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - @Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}") + @Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}") void delByMainSid(String sid); - List fetchWhenDetailsVoBySid(String sid); + List fetchWhenDetailsVoBySid(String sid); - List fetchLastDetailsVoBySid(String sid); + List fetchLastDetailsVoBySid(String sid); - @Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}") + @Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}") List selByMainSid(String sid); - List fetchBySpecialRebateSid(String mainSid); + List fetchBySpecialRebateSid(String mainSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml index 1bd531a148..fda85acbc1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml @@ -3,24 +3,19 @@ - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java index a89aa98a8d..913a2d8e58 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java @@ -26,20 +26,12 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; -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.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign; /** @@ -63,42 +55,6 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe @Autowired private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialrebateCheckapplydetailService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto){ - ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplydetailService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmSpecialrebateCheckapplydetailService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - ScmSpecialrebateCheckapplydetailDetailsVo vo = scmSpecialrebateCheckapplydetailService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - @Override public ResultBean> specialRebateCheckDetails(String sid) { return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java index 88f4710f7e..7fa5b8bec9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java @@ -26,26 +26,16 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; -import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; -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.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; -import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -63,30 +53,6 @@ import java.util.List; */ @Service public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(ScmSpecialrebateCheckapplydetailQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmSpecialrebateCheckapplydetailQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(ScmSpecialrebateCheckapplydetailDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } public void insertByDto(ScmSpecialrebateCheckapplydetailDto dto) { ScmSpecialrebateCheckapplydetail entity = new ScmSpecialrebateCheckapplydetail(); @@ -94,23 +60,6 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< baseMapper.insert(entity); } - public void updateByDto(ScmSpecialrebateCheckapplydetailDto dto) { - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - ScmSpecialrebateCheckapplydetail entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmSpecialrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid) { - ScmSpecialrebateCheckapplydetail entity = fetchBySid(sid); - ScmSpecialrebateCheckapplydetailDetailsVo vo = new ScmSpecialrebateCheckapplydetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - public void delByMainSid(String sid) { baseMapper.delByMainSid(sid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java index 4e5ec5c16c..80212c6f7b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java @@ -25,21 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmspecialrebatewith; -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.scmspecialrebate.ScmSpecialRebateDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith; -import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo; import java.util.List; -import java.util.Map; /** * Project: anrui-scm(专项返利)
@@ -57,8 +50,6 @@ import java.util.Map; @Mapper public interface ScmSpecialRebateWithMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Delete("delete from scm_special_rebate_with where mainSid = #{dtoSid}") void delByMainSid(String dtoSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml index e132af50d8..3d0733f32e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml @@ -3,12 +3,6 @@ - + select RIGHT (billNo, 4) + from scm_special_rebate_with_apply + where billNo LIKE concat(#{billNo}, '%') + order by billNo desc + limit 1 + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java index 527bddb9ae..f6eba7338a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java @@ -55,100 +55,100 @@ import java.util.List; * @since 1.0 */ @Api(tags = "专项返利预提申请表") -@RestController("com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyRest") +@RestController @RequestMapping("v1/scmspecialrebatewithapply") public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyFeign { - @Autowired - private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService; - - @Override - public ResultBean rePushVoucher(String sid) { - ResultBean rb = ResultBean.fireFail(); - scmSpecialRebateWithApplyService.pushSpecialRebateWithVoucher(sid); - return rb.success(); - } - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmSpecialRebateWithApplyService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto){ - return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService; + + @Override + public ResultBean rePushVoucher(String sid) { + ResultBean rb = ResultBean.fireFail(); + scmSpecialRebateWithApplyService.pushSpecialRebateWithVoucher(sid); + return rb.success(); + } + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmSpecialRebateWithApplyService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto) { + return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return scmSpecialRebateWithApplyService.delAll(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return scmSpecialRebateWithApplyService.delAll(sids); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid); - } - - @Override - public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) { - return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto); - } - - @Override - public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); - return scmSpecialRebateWithApplyService.complete(bv); - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo); - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return scmSpecialRebateWithApplyService.taskReject(flowTaskVo); - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo); - } - - @Override - public ResultBean flowRecord(String procInsId) { - return scmSpecialRebateWithApplyService.flowRecord(procInsId); - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query); - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query); - } - - @Override - public ResultBean delegate(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { - return scmSpecialRebateWithApplyService.delegate(delegateQuery); - } - - @Override - public ResultBean assignTask(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { - return scmSpecialRebateWithApplyService.assignTask(delegateQuery); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid); + } + + @Override + public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) { + return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto); + } + + @Override + public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + return scmSpecialRebateWithApplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmSpecialRebateWithApplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmSpecialRebateWithApplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean delegate(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { + return scmSpecialRebateWithApplyService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) { + return scmSpecialRebateWithApplyService.assignTask(delegateQuery); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java index c423a1f608..6626745156 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatewithapply; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -167,6 +169,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService specialRebateSids = scmSpecialRebateWithDto.getSpecialRebateSids(); diff --git a/工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc b/工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc index 0b7aee86fc..5d5070bc94 100644 --- a/工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc +++ b/工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc @@ -2,9 +2,8 @@ 预付款申请 -河北安瑞汽车租赁集团有限公司 -创建时间：${createTime!} -|审批编号 |${applyCode!} | +${createOrgName!} 创建时间：${createTime!} +|审批编号 |${applyCode!} |付款编号 |${payCode!} | |创建人 |${createByName!} | |创建人部门 |${createByDeptName!} | |费用所属公司 |${createOrgName!} |