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

单车返利预提申请接口开发，其他流程接口调整

zhanglei
God 3 years ago
parent
91307e6499
commit
1cc65304ea
16 changed files with 178 additions and 53 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. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
  2. 24
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  3. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
  4. 31
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  5. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  6. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  7. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
  8. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
  9. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
  10. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
  11. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
  12. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  13. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java
  14. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
  15. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
  16. 57
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
View File

@ -27,6 +27,7 @@ package com.yxt.anrui.base.api.baseinternalpurchase;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurchaseDto;
import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
import com.yxt.common.core.query.PagerQuery;
@ -39,6 +40,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-base(内申请管理) <br/>
@ -116,11 +118,11 @@ public interface BaseInternalPurchaseFeign {
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNextNodeDto query);
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNextNodeDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNextNodeDto query);
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNextNodeDto query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")

24
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -53,6 +53,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -388,10 +389,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callOutOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callOutOrgSid);
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
@ -411,10 +412,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callInOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid);
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
@ -444,10 +445,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
View File

@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.baseinternalpurchase.*;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurchaseDto;
import com.yxt.anrui.base.api.baseoutsourcingapplication.GetNextNodeDto;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@ -41,6 +42,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-base(内申请管理) <br/>
* File: BaseInternalPurchaseFeignFallback.java <br/>
@ -123,12 +126,12 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
}
@Override
public ResultBean getNextNodesForSubmit(GetNextNodeDto gnnd) {
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNextNodeDto gnnd) {
return baseInternalPurchaseService.getNextNodesForSubmit(gnnd);
}
@Override
public ResultBean getPreviousNodesForReject(GetNextNodeDto gnnd) {
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNextNodeDto gnnd) {
return baseInternalPurchaseService.getPreviousNodesForReject(gnnd);
}

31
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseinternalpurchase.*;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseTaskQuery;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseinternalpurchase.flow.SubmitBaseInterNalPurchaseDto;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDto;
@ -41,7 +42,6 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfig;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
@ -63,6 +63,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
@ -513,10 +515,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callOutOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callOutOrgSid);
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
@ -536,10 +538,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callInOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid);
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
@ -572,10 +574,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
@ -600,7 +601,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
}
public ResultBean getNextNodesForSubmit(GetNextNodeDto query) {
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNextNodeDto query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
@ -612,7 +613,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
return rb.success().setData(voList);
}
public ResultBean getPreviousNodesForReject(GetNextNodeDto query) {
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNextNodeDto query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
View File

@ -55,6 +55,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -382,10 +383,10 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将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<String> candidateGroups = voList.get(0).getCandidateGroups();
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callOutOrg + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callOutOrg);
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -1868,7 +1868,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (null == baseVehicle) {
return rb.setMsg("参数错误");
}
BaseVehicle baseVehicle1 = selVehicleByVinNoAndOrgSid(baseVehicle.getVinNo(), baseVehicle.getCreateOrgSid());
if (baseVehicle1 != null) {
return rb.setMsg("该车架号已存在");
}
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
@ -1903,7 +1906,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (null == baseVehicle) {
return rb.setMsg("参数错误");
}
BaseVehicle baseVehicle1 = selVehicleByVinNoAndOrgSid(baseVehicle.getVinNo(), baseVehicle.getCreateOrgSid());
if (baseVehicle1 != null) {
return rb.setMsg("该车架号已存在");
}
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
baseVehicle.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
View File

@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithQuery;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -61,6 +63,11 @@ public interface ScmVehRebateFeign {
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateVo>> listPage(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
@ApiOperation("单车返利预提申请选择单车返利信息")
@PostMapping("/withApplyGetVehRebate")
@ResponseBody
public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
@ApiOperation("新增")
@PostMapping("/save")
@ResponseBody

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
View File

@ -54,6 +54,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
return rb.setMsg("接口anrui-scm/scmvehrebate/listPage无法访问");
}
@Override
public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
return null;
}
@Override
public ResultBean save(ScmVehRebateDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/save无法访问");

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
View File

@ -26,12 +26,16 @@
package com.yxt.anrui.scm.api.scmvehrebatewithapply;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(单车返利预提申请) <br/>
* File: ScmVehRebateWithApplyVo.java <br/>
@ -67,5 +71,6 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("单车返利预提列表")
private List<ScmVehRebateWithDetailsVo> scmVehRebateWiths; // 单车返利预提列表
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
View File

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmvehrebatewithapply;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(单车返利预提申请) <br/>
* File: ScmVehRebateWithApplyDto.java <br/>
@ -67,5 +70,6 @@ public class ScmVehRebateWithApplyDto implements Dto {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("单车返利预提列表")
private List<ScmVehRebateWithDto> scmVehRebateWiths; // 单车返利预提列表
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
View File

@ -66,6 +66,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmVehRebateVo> pv = scmVehRebateService.withApplyGetVehRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean save(@RequestBody ScmVehRebateDto dto){
return scmVehRebateService.saveAll(dto);

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -95,6 +95,37 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
public PagerVo<ScmVehRebateVo> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ScmVehRebateQuery query = pq.getParams();
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
}
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);
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void insertByDto(ScmVehRebateDto dto) {
ScmVehRebate entity = new ScmVehRebate();
BeanUtil.copyProperties(dto, entity, "id", "sid");
@ -133,4 +164,5 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
return rb.success().setMsg("保存成功");
}
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.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 org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -62,4 +63,7 @@ public interface ScmVehRebateWithMapper extends BaseMapper<ScmVehRebateWith> {
@Select("select * from scm_veh_rebate_with")
List<ScmVehRebateWithVo> selectListVo();
@Delete("delete from scm_veh_rebate_with where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
View File

@ -75,7 +75,7 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
PagerVo<ScmVehRebateWithVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmVehRebateWithDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
@ -107,4 +107,9 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
}

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
View File

@ -75,26 +75,20 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmVehRebateWithApplyDto dto){
ResultBean rb = ResultBean.fireFail();
scmVehRebateWithApplyService.saveOrUpdateDto(dto);
return rb.success();
return scmVehRebateWithApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmVehRebateWithApplyService.delBySids(sids);
return rb.success();
return scmVehRebateWithApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmVehRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
ScmVehRebateWithApplyDetailsVo vo = scmVehRebateWithApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
return scmVehRebateWithApplyService.fetchAllDetailsVo(sid);
}
}

57
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
View File

@ -28,6 +28,9 @@ package com.yxt.anrui.scm.biz.scmvehrebatewithapply;
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.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithService;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -39,8 +42,11 @@ import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-scm(单车返利预提申请) <br/>
* File: ScmVehRebateWithApplyService.java <br/>
@ -56,6 +62,10 @@ import org.springframework.stereotype.Service;
*/
@Service
public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebateWithApplyMapper, ScmVehRebateWithApply> {
@Autowired
private ScmVehRebateWithService scmVehRebateWithService;
private QueryWrapper<ScmVehRebateWithApply> createQueryWrapper(ScmVehRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -84,19 +94,40 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
return p;
}
public void saveOrUpdateDto(ScmVehRebateWithApplyDto dto) {
public ResultBean saveOrUpdateDto(ScmVehRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmVehRebateWithDto> scmVehRebateWiths = dto.getScmVehRebateWiths();
if (scmVehRebateWiths == null) {
return rb.setMsg("请选择单车返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
String sid = this.insertByDto(dto).getData();
for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) {
scmVehRebateWith.setMainSid(sid);
scmVehRebateWithService.insertByDto(scmVehRebateWith);
}
return rb.success().setMsg("添加成功");
}
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(dtoSid);
if (scmVehRebateWithApply == null){
rb.setMsg("该单车返利预提申请单不存在");
}
this.updateByDto(dto);
scmVehRebateWithService.delByMainSid(dtoSid);
for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) {
scmVehRebateWith.setMainSid(dtoSid);
scmVehRebateWithService.insertByDto(scmVehRebateWith);
}
return rb.success().setMsg("修改成功");
}
public void insertByDto(ScmVehRebateWithApplyDto dto) {
public ResultBean<String> insertByDto(ScmVehRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ScmVehRebateWithApply entity = new ScmVehRebateWithApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmVehRebateWithApplyDto dto) {
@ -115,4 +146,22 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
for (String sid : sids) {
scmVehRebateWithService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean<ScmVehRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmVehRebateWithApplyDetailsVo scmVehRebateWithApplyDetailsVo = new ScmVehRebateWithApplyDetailsVo();
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(sid);
BeanUtil.copyProperties(scmVehRebateWithApply,scmVehRebateWithApplyDetailsVo);
return null;
}
}
Write Preview
Loading…
Cancel
Save