Browse Source

调账流程点击同意报null问题修改,专项返利预提、核对、管理接口开发

zhanglei
God 3 years ago
parent
commit
946321a0c2
  1. 32
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  2. 4
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  3. 19
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java
  4. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java
  5. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java
  6. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
  7. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java
  8. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java
  9. 23
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
  10. 103
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  11. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java
  12. 23
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java
  13. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml
  14. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
  15. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
  16. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

32
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -370,7 +370,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
Boolean i = false;
if (baseInternalPurchaseVehicles != null){
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
@ -386,7 +386,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
Map<String, Object> map = new HashMap<>();
Map<String, Object> formVariables = bv.getFormVariables();
if (formVariables == null){
if (formVariables == null) {
map.put("isAdj", i);
bv.setFormVariables(map);
}
@ -411,7 +411,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle);
}
//推送金蝶采购退库单
StkInStock stkInStock=new StkInStock();
StkInStock stkInStock = new StkInStock();
/**
* // 入库日期:FDate (必填项)
*/
@ -435,9 +435,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
/**
* // 物料列表:FInStockEntry (必填项)
*/
List<StkInStock.FInStockEntry> fInStockEntry=new ArrayList<>();
List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry();
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
/**
* 车辆类型
*/
@ -655,19 +655,21 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = query.getBaseInternalPurchaseVehicles();
Boolean i = false;
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
break;
if (baseInternalPurchaseVehicles != null) {
if (baseInternalPurchaseVehicles.size() > 0) {
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
String sid = baseInternalPurchaseVehicle.getSid();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
if (!witPinMoney.equals(witPinMoney1)) {
i = true;
break;
}
}
}
bv.getFormVariables().put("isAdj", i);
}
bv.getFormVariables().put("isAdj", i);
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(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());

4
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -34,8 +34,8 @@ public enum ProcDefEnum {
BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),
SCMVEHREBATECHECKAPPLY("单车返利核对申请","process_3xtbbru8:1:560004"),
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请",""),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请",""),
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"),
CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
;

19
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java

@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-scm(专项返利管理) <br/>
* File: ScmSpecialRebateFeign.java <br/>
@ -75,4 +73,21 @@ public interface ScmSpecialRebateFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmSpecialRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("专项返利未预提申请选择专项返利信息")
@PostMapping("/withApplyGetSpecialRebate")
@ResponseBody
public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(@RequestBody PagerQuery<ScmSpecialRebateQuery> pq);
@ApiOperation("专项返利核对申请选择待核对专项返利信息")
@PostMapping("/checkApplyGetSpecialRebate")
@ResponseBody
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetSpecialRebate(@RequestBody PagerQuery<ScmSpecialRebateQuery> pq);
@ApiOperation("专项返利核对申请选择已上传专项返利信息")
@PostMapping("/checkApplyGetAlreadyUploadSpecialRebate")
@ResponseBody
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetAlreadyUploadSpecialRebate(@RequestBody PagerQuery<ScmSpecialRebateQuery> pq);
}

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java

@ -69,4 +69,19 @@ public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmspecialrebate/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(专项返利管理) <br/>
* File: ScmSpecialRebateQuery.java <br/>
@ -63,4 +65,6 @@ public class ScmSpecialRebateQuery implements Query {
private String createEndTime; // 创建结束日期
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("专项返利sid")
private List<String> sidList; // 专项返利sid
}

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

@ -75,6 +75,8 @@ public class ScmSpecialRebateVo implements Vo {
private String estimateRebate; // 预计返利
@ApiModelProperty("所属年月")
private String palceGenDate; // 所属年月
@ApiModelProperty("所属年月(页面展示)")
private String palceGenDateCopy; // 所属年月(页面展示)
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@ApiModelProperty("上传日期")
@ -107,5 +109,7 @@ public class ScmSpecialRebateVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("上传状态(2未上传、3已上传)")
private String uploadState; // 上传状态
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebatewith;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -75,4 +76,9 @@ public interface ScmSpecialRebateWithFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmSpecialRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("专项返利预提查看详情")
@GetMapping("/specialRebateWithDetails/{sid}")
@ResponseBody
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(@PathVariable("sid") String sid);
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeignFallback.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebatewith;
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;
@ -69,4 +70,9 @@ public class ScmSpecialRebateWithFeignFallback implements ScmSpecialRebateWithFe
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmspecialrebatewith/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
return null;
}
}

23
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@ -33,8 +33,6 @@ 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.scmspecialrebate.ScmSpecialRebate;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
@ -97,4 +95,25 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
ScmSpecialRebateDetailsVo vo = scmSpecialRebateService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialRebateVo> pv = scmSpecialRebateService.withApplyGetSpecialRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialRebateVo> pv = scmSpecialRebateService.checkApplyGetSpecialRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialRebateVo> pv = scmSpecialRebateService.checkApplyGetAlreadyUploadSpecialRebate(pq);
return rb.success().setData(pv);
}
}

103
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.biz.scmspecialrebate;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
@ -41,6 +42,8 @@ import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDto;
import org.springframework.stereotype.Service;
import java.util.Date;
/**
* Project: anrui-scm(专项返利管理) <br/>
* File: ScmSpecialRebateService.java <br/>
@ -127,4 +130,104 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
public void updateState(String specialRebateSid) {
baseMapper.updateState(specialRebateSid);
}
public PagerVo<ScmSpecialRebateVo> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ScmSpecialRebateQuery query = pq.getParams();
QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
qw.eq("rebateTypeKey", query.getRebateTypeKey());
}
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
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.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 0);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmSpecialRebateVo> checkApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ScmSpecialRebateQuery query = pq.getParams();
QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
qw.eq("rebateTypeKey", query.getRebateTypeKey());
}
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
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.eq("createOrgSid", query.getCreateOrgSid());
qw.ne("state", 0);
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.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) && record.getIsAdjustment().equals("否")) {
record.setUploadState("3");
}
}
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmSpecialRebateVo> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ScmSpecialRebateQuery query = pq.getParams();
QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
qw.eq("rebateTypeKey", query.getRebateTypeKey());
}
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
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.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 3);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmSpecialRebateVo record : pagging.getRecords()) {
String palceGenDate = record.getPalceGenDate();
Date parse = DateUtil.parse(palceGenDate);
int year = DateUtil.year(parse);
int month = DateUtil.month(parse) + 1;
String palceGenDateCopy = year + "年" + month + "月";
record.setPalceGenDateCopy(palceGenDateCopy);
}
PagerVo<ScmSpecialRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmspecialrebatewith;
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;
@ -97,4 +98,9 @@ public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
ScmSpecialRebateWithDetailsVo vo = scmSpecialRebateWithService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
return scmSpecialRebateWithService.specialRebateWithDetails(sid);
}
}

23
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java

@ -28,6 +28,9 @@ package com.yxt.anrui.scm.biz.scmspecialrebatewith;
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.ScmSpecialRebate;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -39,10 +42,11 @@ import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -60,6 +64,10 @@ import java.util.List;
*/
@Service
public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRebateWithMapper, ScmSpecialRebateWith> {
@Autowired
private ScmSpecialRebateService scmSpecialRebateService;
private QueryWrapper<ScmSpecialRebateWith> createQueryWrapper(ScmSpecialRebateWithQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -119,4 +127,17 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
public List<String> fetchSpecialReBateSidByMainSid(String businessSid) {
return baseMapper.fetchSpecialReBateSidByMainSid(businessSid);
}
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<ScmSpecialRebateDetailsVo> scmSpecialRebateDetailsVos = new ArrayList<>();
String[] sids = sid.split(",");
for (String s : sids) {
ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(s);
ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo();
BeanUtil.copyProperties(scmSpecialRebate,scmSpecialRebateDetailsVo);
scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo);
}
return rb.success().setData(scmSpecialRebateDetailsVos);
}
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml

@ -16,7 +16,6 @@
<where>
${ew.sqlSegment}
</where>
GROUP BY ssrwa.sid
</select>
<select id="selectListAllVo"

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@ -106,18 +106,19 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
ScmSpecialRebateWithApplyQuery query = pq.getParams();
QueryWrapper<ScmSpecialRebateWithApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("svrwa.brandSid", query.getBrandSid());
qw.eq("ssrwa.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getWithApply())) {
qw.like("svrwa.withApply", query.getWithApply());
qw.like("ssrwa.withApply", query.getWithApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (ssrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("svrwa.createOrgSid", query.getCreateOrgSid());
qw.orderByDesc("svrwa.createTime");
qw.eq("ssrwa.createOrgSid", query.getCreateOrgSid());
qw.groupBy("ssrwa.sid");
qw.orderByDesc("ssrwa.createTime");
IPage<ScmSpecialRebateWithApply> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmSpecialRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml

@ -16,7 +16,6 @@
<where>
${ew.sqlSegment}
</where>
GROUP BY svrwa.sid
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@ -116,6 +116,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("svrwa.createOrgSid", query.getCreateOrgSid());
qw.groupBy("svrwa.sid");
qw.orderByDesc("svrwa.createTime");
IPage<ScmVehRebateWithApply> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);

Loading…
Cancel
Save