|
|
|
@ -46,6 +46,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollect |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; |
|
|
|
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; |
|
|
|
@ -97,13 +98,6 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
@Autowired |
|
|
|
private FlowFeign flowFeign; |
|
|
|
|
|
|
|
private QueryWrapper<ScmCollectionrebateCheckapply> createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>(); |
|
|
|
return qw; |
|
|
|
} |
|
|
|
|
|
|
|
public PagerVo<ScmCollectionrebateCheckapplyVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) { |
|
|
|
ScmCollectionrebateCheckapplyQuery query = pq.getParams(); |
|
|
|
QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>(); |
|
|
|
@ -147,26 +141,32 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
return p; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBrandName())) { |
|
|
|
qw.like("scc.brandName", query.getBrandName()); |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("scc.useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getDeptName())) { |
|
|
|
qw.like("scc.deptName", query.getDeptName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("scc.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCheckApply())) { |
|
|
|
qw.like("scc.collectionApply", query.getCheckApply()); |
|
|
|
qw.like("scc.checkApply", query.getCheckApply()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (scc.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 (scc.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (scc.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.groupBy("scc.sid"); |
|
|
|
qw.orderByDesc("scc.createTime"); |
|
|
|
IPage<ScmCollectionrebateCheckapply> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<ScmCollectionrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
List<ScmCollectionrebateCheckapplyVo> records = pagging.getRecords(); |
|
|
|
for (ScmCollectionrebateCheckapplyVo record : records) { |
|
|
|
record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf("."))); |
|
|
|
record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf("."))); |
|
|
|
record.setCollectionMoney(record.getCollectionMoney().substring(0, record.getCollectionMoney().lastIndexOf("."))); |
|
|
|
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf("."))); |
|
|
|
} |
|
|
|
PagerVo<ScmCollectionrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
} |
|
|
|
@ -174,32 +174,15 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
List<ScmCollectionrebateCheckapplydetailDto> scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails(); |
|
|
|
List<ScmCollectionrebateCheckapplydetailDto> scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails(); |
|
|
|
if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) { |
|
|
|
List<ScmCollectionrebateCheckapplydetailDto> scmCollectionrebateCheckapplydetailVos = dto.getScmCollectionrebateCheckapplydetailVos(); |
|
|
|
if (scmCollectionrebateCheckapplydetailVos.size() == 0) { |
|
|
|
return rb.setMsg("请选择已核对回款返利信息"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(dtoSid)) { |
|
|
|
String sid = this.insertByDto(dto).getData(); |
|
|
|
if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { |
|
|
|
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { |
|
|
|
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { |
|
|
|
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); |
|
|
|
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); |
|
|
|
scmCollectionrebateCheckapplydetail1.setMainSid(sid); |
|
|
|
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { |
|
|
|
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { |
|
|
|
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { |
|
|
|
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); |
|
|
|
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); |
|
|
|
scmCollectionrebateCheckapplydetail1.setMainSid(sid); |
|
|
|
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); |
|
|
|
} |
|
|
|
} |
|
|
|
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetailDto : scmCollectionrebateCheckapplydetailVos) { |
|
|
|
scmCollectionrebateCheckapplydetailDto.setMainSid(sid); |
|
|
|
scmCollectionrebateCheckapplydetailService.insertByDto(scmCollectionrebateCheckapplydetailDto); |
|
|
|
} |
|
|
|
return rb.success().setMsg("添加成功").setData(sid); |
|
|
|
} |
|
|
|
@ -209,25 +192,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
} |
|
|
|
this.updateByDto(dto); |
|
|
|
scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid); |
|
|
|
if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) { |
|
|
|
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) { |
|
|
|
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { |
|
|
|
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); |
|
|
|
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); |
|
|
|
scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); |
|
|
|
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) { |
|
|
|
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) { |
|
|
|
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) { |
|
|
|
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail(); |
|
|
|
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid); |
|
|
|
scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid); |
|
|
|
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1); |
|
|
|
} |
|
|
|
} |
|
|
|
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetailDto : scmCollectionrebateCheckapplydetailVos) { |
|
|
|
scmCollectionrebateCheckapplydetailDto.setMainSid(dtoSid); |
|
|
|
scmCollectionrebateCheckapplydetailService.insertByDto(scmCollectionrebateCheckapplydetailDto); |
|
|
|
} |
|
|
|
return rb.success().setMsg("修改成功").setData(dtoSid); |
|
|
|
} |
|
|
|
@ -255,39 +222,27 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
ScmCollectionrebateCheckapplyDetailsVo scmCollectionrebateCheckapplyDetailsVo = new ScmCollectionrebateCheckapplyDetailsVo(); |
|
|
|
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(sid); |
|
|
|
BeanUtil.copyProperties(scmCollectionrebateCheckapply,scmCollectionrebateCheckapplyDetailsVo); |
|
|
|
BeanUtil.copyProperties(scmCollectionrebateCheckapply, scmCollectionrebateCheckapplyDetailsVo); |
|
|
|
List<ScmCollectionrebateCheckapplydetailDetailsVo> scmWhenCollectionrebateCheckapplydetailDetailsVos = scmCollectionrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid); |
|
|
|
if (scmWhenCollectionrebateCheckapplydetailDetailsVos.size() > 0){ |
|
|
|
if (scmWhenCollectionrebateCheckapplydetailDetailsVos.size() > 0) { |
|
|
|
for (ScmCollectionrebateCheckapplydetailDetailsVo scmWhenCollectionrebateCheckapplydetailDetailsVo : scmWhenCollectionrebateCheckapplydetailDetailsVos) { |
|
|
|
String CollectionRebateSid = scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid(); |
|
|
|
String[] CollectionRebateSids = CollectionRebateSid.split(","); |
|
|
|
scmWhenCollectionrebateCheckapplydetailDetailsVo.setCollectionRebateSids(Arrays.asList(CollectionRebateSids)); |
|
|
|
scmWhenCollectionrebateCheckapplydetailDetailsVo.setEstimateRebate(scmWhenCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().lastIndexOf("."))); |
|
|
|
scmWhenCollectionrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf("."))); |
|
|
|
scmWhenCollectionrebateCheckapplydetailDetailsVo.setCollectionMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().lastIndexOf("."))); |
|
|
|
scmWhenCollectionrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf("."))); |
|
|
|
} |
|
|
|
} |
|
|
|
scmCollectionrebateCheckapplyDetailsVo.setScmWhenCollectionrebateCheckapplydetailDetails(scmWhenCollectionrebateCheckapplydetailDetailsVos); |
|
|
|
List<ScmCollectionrebateCheckapplydetailDetailsVo> scmLastCollectionrebateCheckapplydetailDetailsVos = scmCollectionrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid); |
|
|
|
if (scmLastCollectionrebateCheckapplydetailDetailsVos.size() > 0){ |
|
|
|
if (scmLastCollectionrebateCheckapplydetailDetailsVos.size() > 0) { |
|
|
|
for (ScmCollectionrebateCheckapplydetailDetailsVo scmLastCollectionrebateCheckapplydetailDetailsVo : scmLastCollectionrebateCheckapplydetailDetailsVos) { |
|
|
|
String CollectionRebateSid = scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionRebateSid(); |
|
|
|
String[] CollectionRebateSids = CollectionRebateSid.split(","); |
|
|
|
scmLastCollectionrebateCheckapplydetailDetailsVo.setCollectionRebateSids(Arrays.asList(CollectionRebateSids)); |
|
|
|
scmLastCollectionrebateCheckapplydetailDetailsVo.setEstimateRebate(scmLastCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getEstimateRebate().lastIndexOf("."))); |
|
|
|
scmLastCollectionrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf("."))); |
|
|
|
scmLastCollectionrebateCheckapplydetailDetailsVo.setCollectionMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getCollectionMoney().lastIndexOf("."))); |
|
|
|
scmLastCollectionrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastCollectionrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf("."))); |
|
|
|
String withholdingDate = scmLastCollectionrebateCheckapplydetailDetailsVo.getWithholdingDate(); |
|
|
|
Date parse = DateUtil.parse(withholdingDate); |
|
|
|
int year = DateUtil.year(parse); |
|
|
|
int month = DateUtil.month(parse) + 1; |
|
|
|
String withholdingDateCopy = year + "年" + month + "月"; |
|
|
|
scmLastCollectionrebateCheckapplydetailDetailsVo.setWithholdingDateCopy(withholdingDateCopy); |
|
|
|
} |
|
|
|
} |
|
|
|
scmCollectionrebateCheckapplyDetailsVo.setScmLastCollectionrebateCheckapplydetailDetails(scmLastCollectionrebateCheckapplydetailDetailsVos); |
|
|
|
List<ScmCollectionrebateCheckapplydetailVo> scmCollectionrebateCheckapplydetailVos = scmCollectionrebateCheckapplydetailService.selByMainSid(sid); |
|
|
|
scmCollectionrebateCheckapplyDetailsVo.setScmCollectionrebateCheckapplydetailVos(scmCollectionrebateCheckapplydetailVos); |
|
|
|
return rb.success().setData(scmCollectionrebateCheckapplyDetailsVo); |
|
|
|
} |
|
|
|
|
|
|
|
@ -326,9 +281,9 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
//若有网关，则赋值网关中判断的字段。
|
|
|
|
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
|
|
|
|
@ -503,7 +458,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm |
|
|
|
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.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); |
|
|
|
} |
|
|
|
|
God
6 months ago