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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 8 months ago
parent
f560f1b3d1 31beea2e2d
commit
2b2949b90c
8 changed files with 135 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
  2. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
  3. 47
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  4. 84
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  5. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java
  6. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
  7. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java
  8. 28
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
View File

@ -110,7 +110,9 @@ public class ScmSpecialRebateVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("上传状态(2未上传、3已上传)")
@ApiModelProperty("上传状态(0未上传、1已上传)")
private String uploadState; // 上传状态
@ApiModelProperty("是否可以点击是否调整")
private Boolean adjustOrNot;
}

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

@ -66,8 +66,8 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
@Select("select * from scm_special_rebate")
List<ScmSpecialRebateVo> selectListVo();
@Update("update scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
void updateState(String specialRebateSid);
@Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}")
void updateState(@Param("specialRebateSid") String specialRebateSid,@Param("state") Integer state);
@Update("update scm_special_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{sid}")
void updateWithholdingDateBySid(String sid);

47
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -44,6 +44,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -148,8 +149,10 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
this.insertByDto(dto);
return;
}
if (dto.getState().equals("1")){
dto.setState("3");
if ("是".equals(dto.getIsAdjustment())){
dto.setAdjustmentState(1);
}else {
dto.setAdjustmentState(2);
}
this.updateByDto(dto);
}
@ -178,8 +181,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
return vo;
}
public void updateState(String specialRebateSid) {
baseMapper.updateState(specialRebateSid);
public void updateState(String specialRebateSid,Integer state) {
baseMapper.updateState(specialRebateSid,state);
}
public PagerVo<ScmSpecialRebateVo> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
@ -267,17 +270,39 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.ne("state", 0);
qw.eq("state", 2);
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmSpecialRebateVo record : pagging.getRecords()) {
//上传状态：未上传
if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
record.setUploadState("2");
if (StringUtils.isBlank(record.getUploadDate())) {
record.setUploadState("0");
} else {//上传状态：已上传
record.setUploadState("1");
}
//上传状态：已上传
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")) {
record.setUploadState("3");
//是否调整
if (0 == record.getAdjustmentState()) {
if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) {
BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
int i = decimal.compareTo(BigDecimal.ZERO);
if (i < 0) {//小于
record.setIsAdjustment("否");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(true);
} else if (i == 0) {//等于
record.setIsAdjustment("是");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(false);
} else {//大于
record.setIsAdjustment("是");
record.setAdjustmentMoney(decimal.toString());
record.setAdjustOrNot(true);
}
} else {
record.setIsAdjustment("否");
record.setAdjustmentMoney("0");
record.setAdjustOrNot(false);
}
}
}
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
@ -373,6 +398,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
String money = String.valueOf(mon + cost);
scmSpecialRebateDto.setMoney(money);
scmSpecialRebateDto.setAdjustmentMoney(dto.getAdjustmentMoney());
scmSpecialRebateDto.setIsAdjustment("是");
scmSpecialRebateDto.setAdjustmentState(1);
updateBySid(scmSpecialRebateDto, sid);
return rb.success().setMsg("调整成功");
}

84
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
View File

@ -42,6 +42,7 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
@ -49,6 +50,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
import org.apache.commons.lang3.StringUtils;
@ -88,6 +90,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
@Autowired
private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
@Autowired
private ScmSpecialRebateService scmSpecialRebateService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@ -163,11 +167,11 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
IPage<ScmSpecialrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmSpecialrebateCheckapplyVo> records = pagging.getRecords();
for (ScmSpecialrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0,record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0,record.getMoney().lastIndexOf(".")));
record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0, record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0, record.getMoney().lastIndexOf(".")));
}
PagerVo<ScmSpecialrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
@ -257,32 +261,32 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapplyDetailsVo scmSpecialrebateCheckapplyDetailsVo = new ScmSpecialrebateCheckapplyDetailsVo();
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(sid);
BeanUtil.copyProperties(scmSpecialrebateCheckapply,scmSpecialrebateCheckapplyDetailsVo);
BeanUtil.copyProperties(scmSpecialrebateCheckapply, scmSpecialrebateCheckapplyDetailsVo);
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid);
if (scmWhenSpecialrebateCheckapplydetailDetailsVos.size() > 0){
if (scmWhenSpecialrebateCheckapplydetailDetailsVos.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDetailsVo scmWhenSpecialrebateCheckapplydetailDetailsVo : scmWhenSpecialrebateCheckapplydetailDetailsVos) {
String SpecialRebateSid = scmWhenSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid();
String[] SpecialRebateSids = SpecialRebateSid.split(",");
scmWhenSpecialrebateCheckapplydetailDetailsVo.setSpecialRebateSids(Arrays.asList(SpecialRebateSids));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenSpecialrebateCheckapplydetailDetailsVo.setMoney(scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0, scmWhenSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
}
}
scmSpecialrebateCheckapplyDetailsVo.setScmWhenSpecialrebateCheckapplydetailDetails(scmWhenSpecialrebateCheckapplydetailDetailsVos);
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmLastSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid);
if (scmLastSpecialrebateCheckapplydetailDetailsVos.size() > 0){
if (scmLastSpecialrebateCheckapplydetailDetailsVos.size() > 0) {
for (ScmSpecialrebateCheckapplydetailDetailsVo scmLastSpecialrebateCheckapplydetailDetailsVo : scmLastSpecialrebateCheckapplydetailDetailsVos) {
String SpecialRebateSid = scmLastSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid();
String[] SpecialRebateSids = SpecialRebateSid.split(",");
scmLastSpecialrebateCheckapplydetailDetailsVo.setSpecialRebateSids(Arrays.asList(SpecialRebateSids));
scmLastSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setWithRebate(scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastSpecialrebateCheckapplydetailDetailsVo.setMoney(scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().substring(0, scmLastSpecialrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
String withholdingDate = scmLastSpecialrebateCheckapplydetailDetailsVo.getWithholdingDate();
Date parse = DateUtil.parse(withholdingDate);
int year = DateUtil.year(parse);
@ -344,9 +348,9 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
//若有网关，则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//=====================添加app所需参数
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",businessSid);
variables.put("app",appMap);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -356,10 +360,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
//查询单车明细
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.selByMainSid(dto.getSid());
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 3);
}
return voResultBean;
}
if (r == 2) {
@ -371,6 +380,9 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
bv.setTaskDefKey(scmSpecialrebateCheckapply.getNodeSid());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 3);
}
return complete(bv);
}
return rb;
@ -418,6 +430,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 4);
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -483,16 +499,36 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmSpecialrebateCheckapply.getTaskId();
List<ScmSpecialrebateCheckapplydetailDetailsVo> scmSpecialrebateCheckapplydetailDetailsVos = scmSpecialrebateCheckapplydetailService.selByMainSid(query.getBusinessSid());
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (query.getUserSid().equals(scmSpecialrebateCheckapply.getCreateBySid())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 2);
}
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmSpecialrebateCheckapplydetailDetailsVos) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailDetailsVo.getSpecialRebateSid(), 2);
}
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
@ -521,7 +557,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList());
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java
View File

@ -71,4 +71,7 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSp
List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
@Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
List<ScmSpecialrebateCheckapplydetailDetailsVo> selByMainSid(String sid);
}

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

@ -119,4 +119,8 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
public List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid) {
return baseMapper.fetchLastDetailsVoBySid(sid);
}
public List<ScmSpecialrebateCheckapplydetailDetailsVo> selByMainSid(String sid) {
return baseMapper.selByMainSid(sid);
}
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java
View File

@ -29,6 +29,7 @@ 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;

28
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
View File

@ -49,6 +49,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
import org.apache.commons.lang3.StringUtils;
@ -317,6 +318,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
List<String> specialRebateSids = scmSpecialRebateWith.getSpecialRebateSids();
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid);
scmSpecialRebateService.updateState(specialRebateSid, 1);
}
}
if (r == 1) {
@ -384,7 +386,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid);
scmSpecialRebateService.updateState(specialRebateSid, 2);
}
}
return rb.success().setData(resultBean.getData());
@ -451,16 +453,36 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
}
ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmSpecialRebateWithApply.getTaskId();
List<String> specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(query.getBusinessSid());
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (query.getUserSid().equals(scmSpecialRebateWithApply.getCreateBySid())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid,0);
}
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid,0);
}
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");

Write Preview
Loading…
Cancel
Save