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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 4 months ago
parent
3de6119424 a53f6ba638
commit
7bd4dd368b
16 changed files with 257 additions and 182 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. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java
  2. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java
  3. 32
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java
  4. 30
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java
  5. 28
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java
  6. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java
  7. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java
  8. 39
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java
  9. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java
  10. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
  11. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
  12. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java
  13. 20
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml
  14. 166
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
  15. 39
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
  16. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailRest.java

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java
View File

@ -53,6 +53,8 @@ public class ScmStayDisRebateVo implements Vo {
private String sid; // sid
@ApiModelProperty("核对申请sid")
private String checkApplySid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("采购系统sid")
@ -74,13 +76,13 @@ public class ScmStayDisRebateVo implements Vo {
private String withholdingDate;
@ApiModelProperty("返利名称")
private String rebateName; // 返利名称
@ApiModelProperty("返利类型key")
@ApiModelProperty("返利类型key")
private String rebateTypeKey; // 返利类型key
@ApiModelProperty("返利类型value")
@ApiModelProperty("返利类型value")
private String rebateTypeValue; // 返利类型value
@ApiModelProperty("预提返利")
@ApiModelProperty("预提返利")
private String estimateRebate; // 预提返利
@ApiModelProperty("上传总金额")
@ApiModelProperty("上传总金额")
private String uploadMoney; // 上传总金额
@ApiModelProperty("所属年月")
private String palceGenDate;

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java
View File

@ -26,11 +26,14 @@
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialrebateCheckapply.java <br/>
@ -52,6 +55,9 @@ public class ScmSpecialrebateCheckapply extends BaseEntity {
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")

32
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java
View File

@ -53,38 +53,40 @@ import java.util.Date;
public class ScmSpecialrebatedistribute extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime; // 办结日期
@ApiModelProperty("分配申请")
@ApiModelProperty("分配申请")
private String title; // 分配申请
@ApiModelProperty("预提返利")
@ApiModelProperty("预提返利")
private String withRebate; // 预提返利
@ApiModelProperty("分配总金额")
@ApiModelProperty("分配总金额")
private String distributionMoneyTotal; // 分配总金额
@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
private String orgPath;

30
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java
View File

@ -56,43 +56,45 @@ public class ScmSpecialrebatedistributeDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime; // 办结日期
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("分配申请")
@ApiModelProperty("分配申请")
private String title; // 分配申请
@ApiModelProperty("预提返利")
@ApiModelProperty("预提返利")
private String withRebate; // 预提返利
@ApiModelProperty("分配总金额")
@ApiModelProperty("分配总金额")
private String distributionMoneyTotal; // 分配总金额
@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
private String orgPath;
@ApiModelProperty("分配申请的专项返利列表")

28
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java
View File

@ -56,40 +56,42 @@ public class ScmSpecialrebatedistributeDto implements Dto {
private String sid; // sid
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime; // 办结日期
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("分配申请")
@ApiModelProperty("分配申请")
private String title; // 分配申请
@ApiModelProperty("预提返利")
@ApiModelProperty("预提返利")
private String withRebate; // 预提返利
@ApiModelProperty("分配总金额")
@ApiModelProperty("分配总金额")
private String distributionMoneyTotal; // 分配总金额
@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
private String orgPath;
@ApiModelProperty("分配申请的专项返利列表")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java
View File

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

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java
View File

@ -47,20 +47,24 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "专项返利分配申请表 查询条件", description = "专项返利分配申请表 查询条件")
public class ScmSpecialrebatedistributeQuery implements Query {
public class ScmSpecialrebatedistributeQuery implements Query {
@ApiModelProperty("分配申请")
private String title; // 分配申请
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("分公司")
private String createOrgName;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@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 title;
private String userSid;
private String orgPath;

39
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java
View File

@ -54,12 +54,22 @@ public class ScmSpecialrebatedistributeVo implements Vo {
private String sid; // sid
@ApiModelProperty("状态")
private String state;
@ApiModelProperty("申请部门")
private String deptName;
@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;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("分配申请")
private String title;
@ApiModelProperty("预提返利")
@ -68,18 +78,11 @@ public class ScmSpecialrebatedistributeVo implements Vo {
private String uploadMoney;
@ApiModelProperty("分配总金额")
private String distributionMoneyTotal;
@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 nodeState; // 流程状态
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("分配数量")
private String disNum;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")
private String procInstId;
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java
View File

@ -26,11 +26,14 @@
package com.yxt.anrui.scm.api.scmspecialrebatewithapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialRebateWithApply.java <br/>
@ -52,6 +55,9 @@ public class ScmSpecialRebateWithApply extends BaseEntity {
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")
@ -80,6 +86,4 @@ public class ScmSpecialRebateWithApply extends BaseEntity {
private String taskId; // taskId
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("办结日期")
private String finishTime;
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
View File

@ -50,12 +50,13 @@
ssr.purchaseSystemName,
ssr.palceGenDate,
ssr.withholdingDate,
ssr.uploadMoney + ssr.secondaryUploadMoney - ssr.onceItureCost - ssr.onceTreatCost - ssr.onceSuppCost - ssr.secondItureCost - ssr.secondTreatCost - ssr.secondSuppCost as uploadMoney
ssr.uploadMoney + ssr.secondaryUploadMoney - ssr.onceItureCost - ssr.onceTreatCost - ssr.onceSuppCost - ssr.secondItureCost - ssr.secondTreatCost - ssr.secondSuppCost as uploadMoney,
sscad.mainSid as checkApplySid
FROM scm_specialrebate_checkapplydetail sscad
LEFT JOIN scm_special_rebate ssr
ON sscad.`specialRebateSid` = ssr.`sid`
ON sscad.specialRebateSid = ssr.sid
LEFT JOIN scm_specialrebate_checkapply ssca
ON ssca.`sid` = sscad.`mainSid`
ON ssca.sid = sscad.mainSid
<where>
${ew.sqlSegment}
</where>

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
View File

@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -78,10 +79,15 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = baseMapper.fetchBySpecialRebateSid(sid);
for (ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo : scmSpecialRebateDetailsVos) {
scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
String[] sids = sid.split(",");
for (String s : sids) {
List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos1 = baseMapper.fetchBySpecialRebateSid(s);
for (ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo : scmSpecialRebateDetailsVos1) {
scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost()));
scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString());
scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
}
}
return rb.success().setData(scmSpecialRebateDetailsVos);
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java
View File

@ -55,12 +55,14 @@ import java.util.Map;
@Mapper
public interface ScmSpecialrebatedistributeMapper extends BaseMapper<ScmSpecialrebatedistribute> {
IPage<ScmSpecialrebatedistributeVo> selectPageVo(IPage<ScmSpecialrebatedistribute> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebatedistribute> qw);
int selectBySid(String join);
IPage<ScmSpecialrebatedistributeVo> selectPageVo(IPage<ScmSpecialrebatedistribute> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebatedistribute> qw);
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> beanToMap);
@Update("update scm_specialrebatedistribute set state = #{state} where sid = #{sid}")
void updateState(@Param("sid") String sid, @Param("state") int state);
String selectNum(String billNo);
}

20
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml
View File

@ -8,15 +8,16 @@
SELECT
sp.*,
SUM(
sr.`uploadMoney` + sr.`secondaryUploadMoney` - sr.`onceItureCost` - sr.`onceTreatCost` - sr.`onceSuppCost` -
sr.`secondItureCost` - sr.`secondTreatCost` - sr.`secondSuppCost`
) AS uploadMoney
sr.uploadMoney + sr.secondaryUploadMoney - sr.onceItureCost - sr.onceTreatCost - sr.onceSuppCost -
sr.secondItureCost - sr.secondTreatCost - sr.secondSuppCost
) AS uploadMoney,
GROUP_CONCAT(sr.sid) AS specialSid
FROM
scm_specialrebatedistribute sp
LEFT JOIN scm_specialrebatedistributedetail sd
ON sd.mainSid = sp.sid
LEFT JOIN scm_special_rebate sr
ON sd.`specialRebateSid` = sr.`sid`
ON sd.specialRebateSid = sr.sid
<where>
${ew.sqlSegment}
</where>
@ -32,6 +33,9 @@
<update id="updateFlowFiled">
UPDATE scm_specialrebatedistribute
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
@ -43,4 +47,12 @@
</if>
WHERE sid=#{sid}
</update>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from scm_specialrebatedistribute
where billNo LIKE concat(#{billNo}, '%')
order by billNo desc
limit 1
</select>
</mapper>

166
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
View File

@ -60,93 +60,93 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribu
* @since 1.0
*/
@Api(tags = "专项返利分配申请表")
@RestController("com.yxt.anrui.scm.biz.scmspecialrebatedistribute.ScmSpecialrebatedistributeRest")
@RestController
@RequestMapping("v1/scmspecialrebatedistribute")
public class ScmSpecialrebatedistributeRest implements ScmSpecialrebatedistributeFeign {
@Autowired
private ScmSpecialrebatedistributeService scmSpecialrebatedistributeService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmSpecialrebatedistributeVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebatedistributeQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialrebatedistributeVo> pv = scmSpecialrebatedistributeService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmSpecialrebatedistributeDto dto){
return scmSpecialrebatedistributeService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@Autowired
private ScmSpecialrebatedistributeService scmSpecialrebatedistributeService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmSpecialrebatedistributeVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebatedistributeQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialrebatedistributeVo> pv = scmSpecialrebatedistributeService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmSpecialrebatedistributeDto dto) {
return scmSpecialrebatedistributeService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return scmSpecialrebatedistributeService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return scmSpecialrebatedistributeService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmSpecialrebatedistributeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return scmSpecialrebatedistributeService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean submitSpecialRebatedistribute(SubmitScmSpecialRebatedistributeDto dto) {
return scmSpecialrebatedistributeService.submitSpecialRebatedistribute(dto);
}
@Override
public ResultBean complete(ScmSpecialRebatedistributeCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId());
return scmSpecialrebatedistributeService.complete(bv);
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return scmSpecialrebatedistributeService.revokeProcess(flowTaskVo);
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return scmSpecialrebatedistributeService.taskReject(flowTaskVo);
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return scmSpecialrebatedistributeService.breakProcess(flowTaskVo);
}
@Override
public ResultBean flowRecord(String procInsId) {
return scmSpecialrebatedistributeService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return scmSpecialrebatedistributeService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return scmSpecialrebatedistributeService.getPreviousNodesForReject(query);
}
@Override
public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery query) {
return scmSpecialrebatedistributeService.delegate(query);
}
@Override
public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery query) {
return scmSpecialrebatedistributeService.assignTask(query);
}
public ResultBean<ScmSpecialrebatedistributeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
return scmSpecialrebatedistributeService.fetchDetailsVoBySid(sid);
}
@Override
public ResultBean submitSpecialRebatedistribute(SubmitScmSpecialRebatedistributeDto dto) {
return scmSpecialrebatedistributeService.submitSpecialRebatedistribute(dto);
}
@Override
public ResultBean complete(ScmSpecialRebatedistributeCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId());
return scmSpecialrebatedistributeService.complete(bv);
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return scmSpecialrebatedistributeService.revokeProcess(flowTaskVo);
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return scmSpecialrebatedistributeService.taskReject(flowTaskVo);
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return scmSpecialrebatedistributeService.breakProcess(flowTaskVo);
}
@Override
public ResultBean flowRecord(String procInsId) {
return scmSpecialrebatedistributeService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return scmSpecialrebatedistributeService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return scmSpecialrebatedistributeService.getPreviousNodesForReject(query);
}
@Override
public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery query) {
return scmSpecialrebatedistributeService.delegate(query);
}
@Override
public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery query) {
return scmSpecialrebatedistributeService.assignTask(query);
}
}

39
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
View File

@ -26,9 +26,11 @@
package com.yxt.anrui.scm.biz.scmspecialrebatedistribute;
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;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@ -36,6 +38,8 @@ import com.yxt.anrui.flowable.api.flow2.FlowFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
@ -103,6 +107,8 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
private FlowFeign flowFeign;
@Autowired
private ScmSpecialRebateService scmSpecialRebateService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<ScmSpecialrebatedistributeVo> listPageVo(PagerQuery<ScmSpecialrebatedistributeQuery> pq) {
ScmSpecialrebatedistributeQuery query = pq.getParams();
@ -147,20 +153,31 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
return p;
}
}
if (StringUtils.isNotBlank(query.getTitle())) {
qw.like("sp.title", query.getTitle());
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("sp.createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("sp.purchaseSystemName", query.getPurchaseSystemName());
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("sp.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("sp.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("sp.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getTitle())) {
qw.like("sp.title", query.getTitle());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (sp.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (sp.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 (sp.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (sp.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
);
qw.groupBy("sp.sid");
IPage<ScmSpecialrebatedistribute> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialrebatedistributeVo> pagging = baseMapper.selectPageVo(page, qw);
@ -173,6 +190,18 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
String dtoSid = dto.getSid();
List<ScmSpecialrebatedistributedetailDto> scmSpecialrebatedistributedetails = dto.getScmSpecialrebatedistributedetails();
if (StringUtils.isBlank(dtoSid)) {
//生成单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
billNo = "ZXFLFP" + sysOrganizationVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
dto.setBillNo(billNo);
String sid = this.insertByDto(dto).getData();
for (ScmSpecialrebatedistributedetailDto scmSpecialrebatedistributedetail : scmSpecialrebatedistributedetails) {
ScmSpecialrebatedistributedetail scmSpecialrebatedistributedetail1 = new ScmSpecialrebatedistributedetail();

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailRest.java
View File

@ -55,7 +55,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedi
* @since 1.0
*/
@Api(tags = "分配申请的专项返利列表")
@RestController("com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailRest")
@RestController
@RequestMapping("v1/scmspecialrebatedistributedetail")
public class ScmSpecialrebatedistributedetailRest implements ScmSpecialrebatedistributedetailFeign {

Write Preview
Loading…
Cancel
Save