Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
3f1c92f7db
  1. 90
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannel.java
  2. 94
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelVo.java
  3. 105
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelRest.java
  4. 147
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelService.java
  5. 38
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  6. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicy.java
  7. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java
  8. 77
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java
  9. 18
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDetailsVo.java
  10. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java
  11. 41
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java
  12. 61
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java
  13. 35
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelQuery.java
  14. 80
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelVo.java
  15. 40
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.java
  16. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.xml
  17. 87
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java
  18. 128
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

90
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannel.java

@ -1,90 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannel.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannel <br/>
* Description: 采购渠道选择表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购渠道选择表", description = "采购渠道选择表")
@TableName("bus_purchase_channel")
public class BusPurchaseChannel extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("销售订单sid")
private String saleOrderSid; // 销售订单sid
@ApiModelProperty("销售订单编号")
private String saleOrderNo; // 销售订单编号
@ApiModelProperty("销售订单审批日期")
private String saleOrderApproDate; // 销售订单审批日期
@ApiModelProperty("业务类型")
private String businessType; // 业务类型
@ApiModelProperty("申请部门sid")
private String applyDeptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String applyDeptName; // 申请部门名称
@ApiModelProperty("申请人sid")
private String applyPeoSid; // 申请人sid
@ApiModelProperty("申请人姓名")
private String applyPeoName; // 申请人姓名
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("配置sid")
private String configSid; // 配置sid
@ApiModelProperty("配置名称")
private String configName; // 配置名称
@ApiModelProperty("数量")
private String num; // 数量
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("采购渠道key")
private String purchaseOrderTypeKey; // 采购渠道key
@ApiModelProperty("采购渠道value")
private String purchaseOrderTypeValue; // 采购渠道value
}

94
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelVo.java

@ -1,94 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo <br/>
* Description: 采购渠道选择表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购渠道选择表 视图数据对象", description = "采购渠道选择表 视图数据对象")
public class BusPurchaseChannelVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("销售订单sid")
private String saleOrderSid; // 销售订单sid
@ApiModelProperty("销售订单编号")
private String saleOrderNo; // 销售订单编号
@ApiModelProperty("销售订单审批日期")
private String saleOrderApproDate; // 销售订单审批日期
@ApiModelProperty("业务类型")
private String businessType; // 业务类型
@ApiModelProperty("申请部门sid")
private String applyDeptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String applyDeptName; // 申请部门名称
@ApiModelProperty("申请人sid")
private String applyPeoSid; // 申请人sid
@ApiModelProperty("申请人姓名")
private String applyPeoName; // 申请人姓名
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("配置sid")
private String configSid; // 配置sid
@ApiModelProperty("配置名称")
private String configName; // 配置名称
@ApiModelProperty("数量")
private String num; // 数量
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("采购渠道key")
private String purchaseOrderTypeKey; // 采购渠道key
@ApiModelProperty("采购渠道value")
private String purchaseOrderTypeValue; // 采购渠道value
@ApiModelProperty("流程定义id")
private String procDefId;
@ApiModelProperty("流程实例id")
private String procInstId;
}

105
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelRest.java

@ -1,105 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.buspurchasechannel;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
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.buscenter.api.buspurchasechannel.BusPurchaseChannel;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelQuery;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDetailsVo;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeign;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelRest <br/>
* Description: 采购渠道选择表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "采购渠道选择表")
@RestController("com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelRest")
@RequestMapping("v1/buspurchasechannel")
public class BusPurchaseChannelRest implements BusPurchaseChannelFeign {
@Autowired
private BusPurchaseChannelService busPurchaseChannelService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BusPurchaseChannelVo>> listPage(@RequestBody PagerQuery<BusPurchaseChannelQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BusPurchaseChannelVo> pv = busPurchaseChannelService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BusPurchaseChannelDto dto){
ResultBean rb = ResultBean.fireFail();
busPurchaseChannelService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
busPurchaseChannelService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BusPurchaseChannelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BusPurchaseChannelDetailsVo vo = busPurchaseChannelService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean choice(List<BusPurchaseChannelDto> dto) {
return busPurchaseChannelService.choice(dto);
}
}

147
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelService.java

@ -1,147 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.buspurchasechannel;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannel;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelQuery;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDetailsVo;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeign;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelService <br/>
* Description: 采购渠道选择表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BusPurchaseChannelService extends MybatisBaseService<BusPurchaseChannelMapper, BusPurchaseChannel> {
private QueryWrapper<BusPurchaseChannel> createQueryWrapper(BusPurchaseChannelQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusPurchaseChannel> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BusPurchaseChannelVo> listPageVo(PagerQuery<BusPurchaseChannelQuery> pq) {
BusPurchaseChannelQuery query = pq.getParams();
QueryWrapper<BusPurchaseChannel> qw = new QueryWrapper<>();
qw.eq("bpc.state",query.getState());
qw.eq("bpc.useOrgSid",query.getUseOrgSid());
String saleOrderApproStartDate = query.getSaleOrderApproStartDate();
String saleOrderApproEndDate = query.getSaleOrderApproEndDate();
qw.apply(StringUtils.isNotBlank(saleOrderApproStartDate), "date_format (bpc.saleOrderApproDate,'%Y-%m-%d') >= date_format('" + saleOrderApproStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(saleOrderApproEndDate), "date_format (bpc.saleOrderApproDate,'%Y-%m-%d') <= date_format('" + saleOrderApproEndDate + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getSaleOrderNo())){
qw.like("bpc.saleOrderNo",query.getSaleOrderNo());
}
if (StringUtils.isNotBlank(query.getBusinessType())){
qw.like("bpc.businessType",query.getBusinessType());
}
if (StringUtils.isNotBlank(query.getApplyDeptSid())){
qw.eq("bpc.applyDeptSid",query.getApplyDeptSid());
}
if (StringUtils.isNotBlank(query.getApplyPeoName())){
qw.like("bpc.applyPeoName",query.getApplyPeoName());
}
if (StringUtils.isNotBlank(query.getModelName())){
qw.like("bpc.modelName",query.getModelName());
}
if (StringUtils.isNotBlank(query.getConfigName())){
qw.like("bpc.configName",query.getConfigName());
}
IPage<BusPurchaseChannel> page = PagerUtil.queryToPage(pq);
IPage<BusPurchaseChannelVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusPurchaseChannelVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BusPurchaseChannelDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BusPurchaseChannelDto dto){
BusPurchaseChannel entity = new BusPurchaseChannel();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setState(1);
baseMapper.insert(entity);
}
public void updateByDto(BusPurchaseChannelDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BusPurchaseChannel entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BusPurchaseChannelDetailsVo fetchDetailsVoBySid(String sid){
BusPurchaseChannel entity = fetchBySid(sid);
BusPurchaseChannelDetailsVo vo = new BusPurchaseChannelDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean choice(List<BusPurchaseChannelDto> dto) {
ResultBean rb = ResultBean.fireFail();
for (BusPurchaseChannelDto busPurchaseChannelDto : dto) {
String purchaseOrderTypeKey = busPurchaseChannelDto.getPurchaseOrderTypeKey();
String purchaseOrderTypeValue = busPurchaseChannelDto.getPurchaseOrderTypeValue();
String sid = busPurchaseChannelDto.getSid();
baseMapper.choice(sid,purchaseOrderTypeKey,purchaseOrderTypeValue);
}
return rb.success().setMsg("选择成功");
}
}

38
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -72,7 +72,6 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
@ -114,7 +113,6 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService;
import com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelService;
import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService;
@ -167,6 +165,8 @@ import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelDto;
import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.config.component.DocPdfComponent;
@ -244,8 +244,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private BusSalesOrderDepositService busSalesOrderDepositService;
@Autowired
private BusDepositFictitiousService busDepositFictitiousService;
/* @Autowired
private BusPurchaseChannelService busPurchaseChannelService;*/
@Autowired
private BusPurchaseChannelService busPurchaseChannelService;
private ScmPurchaseChannelFeign scmPurchaseChannelFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
@ -5223,24 +5225,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//-----------------推送车款款项结束
//推送采购渠道待选择
BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
busPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
busPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
busPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
busPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
busPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
busPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
busPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
busPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
busPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
busPurchaseChannelService.saveOrUpdateDto(busPurchaseChannelDto);
scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
scmPurchaseChannelFeign.save(scmPurchaseChannelDto);
}
return rb.success().setData(resultBean.getData());
} else {

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicy.java

@ -94,6 +94,10 @@ public class LoanFinPolicy extends BaseEntity {
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("组织全路径")
private String orgSidPath;
@ApiModelProperty("贴息放款类型")
private String discountUseType;
@ApiModelProperty("贴息放款类型key")
private String discountUseTypeKey;
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java

@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.api.loanfinpolicy;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -12,7 +13,8 @@ import lombok.Data;
public class PolicyVo implements Vo {
private static final long serialVersionUID = -2134939652790330324L;
@ApiModelProperty("产品政策名称")
private String name;
@ApiModelProperty("产品政策sid")
private String sid;
}

77
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java

@ -0,0 +1,77 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmpurchasechannel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "采购渠道选择表", description = "采购渠道选择表")
@TableName("scm_purchase_channel")
public class ScmPurchaseChannel extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口")
private String createByName;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("销售订单编号")
private String saleOrderNo;
@ApiModelProperty("销售订单审批日期")
private String saleOrderApproDate;
@ApiModelProperty("业务类型")
private String businessType;
@ApiModelProperty("申请部门sid")
private String applyDeptSid;
@ApiModelProperty("申请部门名称")
private String applyDeptName;
@ApiModelProperty("申请人sid")
private String applyPeoSid;
@ApiModelProperty("申请人姓名")
private String applyPeoName;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("配置名称")
private String configName;
@ApiModelProperty("数量")
private String num;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("采购渠道key")
private String purchaseOrderTypeKey;
@ApiModelProperty("采购渠道value")
private String purchaseOrderTypeValue;
}

18
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelDetailsVo.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDetailsVo.java

@ -23,31 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
package com.yxt.anrui.scm.api.scmpurchasechannel;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo <br/>
* Description: 采购渠道选择表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购渠道选择表 视图数据详情", description = "采购渠道选择表 视图数据详情")
public class BusPurchaseChannelDetailsVo implements Vo {
public class ScmPurchaseChannelDetailsVo implements Vo {
private String sid; // sid

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelDto.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java

@ -23,32 +23,20 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
package com.yxt.anrui.scm.api.scmpurchasechannel;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto <br/>
* Description: 采购渠道选择表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购渠道选择表 数据传输对象", description = "采购渠道选择表 数据传输对象")
public class BusPurchaseChannelDto implements Dto {
public class ScmPurchaseChannelDto implements Dto {
private static final long serialVersionUID = 4704549667731353652L;
private String sid; // sid
@ApiModelProperty("创建人接口")

41
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelFeign.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java

@ -23,62 +23,49 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
package com.yxt.anrui.scm.api.scmpurchasechannel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelFeign.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeign <br/>
* Description: 采购渠道选择表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "采购渠道选择表")
@FeignClient(
contextId = "anrui-buscenter-BusPurchaseChannel",
name = "anrui-buscenter",
path = "v1/buspurchasechannel",
fallback = BusPurchaseChannelFeignFallback.class)
public interface BusPurchaseChannelFeign {
contextId = "anrui-scm-ScmPurchaseChannel",
name = "anrui-scm",
path = "v1/scmpurchasechannel",
fallback = ScmPurchaseChannelFeignFallback.class)
public interface ScmPurchaseChannelFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BusPurchaseChannelVo>> listPage(@RequestBody PagerQuery<BusPurchaseChannelQuery> pq);
public ResultBean<PagerVo<ScmPurchaseChannelVo>> listPage(@RequestBody PagerQuery<ScmPurchaseChannelQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BusPurchaseChannelDto dto);
public ResultBean save(@RequestBody ScmPurchaseChannelDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BusPurchaseChannelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
public ResultBean<ScmPurchaseChannelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("选择")
@PostMapping("/choice")
@ResponseBody
public ResultBean choice(@RequestBody List<BusPurchaseChannelDto> dto);
public ResultBean choice(@RequestBody List<ScmPurchaseChannelDto> dto);
}

61
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelFeignFallback.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
package com.yxt.anrui.scm.api.scmpurchasechannel;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -32,46 +32,33 @@ import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeignFallback <br/>
* Description: 采购渠道选择表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class BusPurchaseChannelFeignFallback implements BusPurchaseChannelFeign {
public class ScmPurchaseChannelFeignFallback implements ScmPurchaseChannelFeign {
@Override
public ResultBean<PagerVo<BusPurchaseChannelVo>> listPage(PagerQuery<BusPurchaseChannelQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/buspurchasechannel/listPage无法访问");
}
@Override
public ResultBean<PagerVo<ScmPurchaseChannelVo>> listPage(PagerQuery<ScmPurchaseChannelQuery> pq) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmpurchasechannel/listPage无法访问");
}
@Override
public ResultBean save(BusPurchaseChannelDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/buspurchasechannel/save无法访问");
}
@Override
public ResultBean save(ScmPurchaseChannelDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmpurchasechannel/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/buspurchasechannel/delBySids无法访问");
}
@Override
public ResultBean delBySids(String[] sids) {
return ResultBean.fireFail().setMsg("接口anrui-scm/scmpurchasechannel/delBySids无法访问");
}
@Override
public ResultBean<BusPurchaseChannelDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/buspurchasechannel/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<ScmPurchaseChannelDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmpurchasechannel/fetchDetailsBySid无法访问");
}
@Override
public ResultBean choice(List<BusPurchaseChannelDto> dto) {
return null;
}
@Override
public ResultBean choice(List<ScmPurchaseChannelDto> dto) {
return null;
}
}

35
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelQuery.java → anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelQuery.java

@ -23,49 +23,36 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.buspurchasechannel;
package com.yxt.anrui.scm.api.scmpurchasechannel;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelQuery.java <br/>
* Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelQuery <br/>
* Description: 采购渠道选择表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "采购渠道选择表 查询条件", description = "采购渠道选择表 查询条件")
public class BusPurchaseChannelQuery implements Query {
public class ScmPurchaseChannelQuery implements Query {
@ApiModelProperty("销售订单编号")
private static final long serialVersionUID = 8346260371303360359L;
@ApiModelProperty("销售订单编号")
private String saleOrderNo; // 销售订单编号
@ApiModelProperty("销售订单审批开始日期")
@ApiModelProperty("销售订单审批开始日期")
private String saleOrderApproStartDate; // 销售订单审批开始日期
@ApiModelProperty("销售订单审批结束日期")
private String saleOrderApproEndDate; // 销售订单审批结束日期
@ApiModelProperty("业务类型")
@ApiModelProperty("业务类型")
private String businessType; // 业务类型
@ApiModelProperty("申请部门sid")
@ApiModelProperty("申请部门sid")
private String applyDeptSid; // 申请部门sid
@ApiModelProperty("申请人姓名")
@ApiModelProperty("申请人姓名")
private String applyPeoName; // 申请人姓名
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("配置名称")
@ApiModelProperty("配置名称")
private String configName; // 配置名称
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("待/已选择")
private String state; // 待/已选择(1待选择,2已选择)

80
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelVo.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmpurchasechannel;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "采购渠道选择表 视图数据对象", description = "采购渠道选择表 视图数据对象")
public class ScmPurchaseChannelVo implements Vo {
private String sid;
@ApiModelProperty("创建人接口")
private String createByName;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("销售订单编号")
private String saleOrderNo;
@ApiModelProperty("销售订单审批日期")
private String saleOrderApproDate;
@ApiModelProperty("业务类型")
private String businessType;
@ApiModelProperty("申请部门sid")
private String applyDeptSid;
@ApiModelProperty("申请部门名称")
private String applyDeptName;
@ApiModelProperty("申请人sid")
private String applyPeoSid;
@ApiModelProperty("申请人姓名")
private String applyPeoName;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("配置名称")
private String configName;
@ApiModelProperty("数量")
private String num;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("采购渠道key")
private String purchaseOrderTypeKey;
@ApiModelProperty("采购渠道value")
private String purchaseOrderTypeValue;
@ApiModelProperty("流程定义id")
private String procDefId;
@ApiModelProperty("流程实例id")
private String procInstId;
}

40
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelMapper.java → anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.java

@ -23,45 +23,29 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.buspurchasechannel;
package com.yxt.anrui.scm.biz.scmpurchasechannel;
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannel;
import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannel;
import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo;
import java.util.List;
/**
* Project: anrui-buscenter(采购渠道选择) <br/>
* File: BusPurchaseChannelMapper.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelMapper <br/>
* Description: 采购渠道选择表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-12-17 10:46:49 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BusPurchaseChannelMapper extends BaseMapper<BusPurchaseChannel> {
public interface ScmPurchaseChannelMapper extends BaseMapper<ScmPurchaseChannel> {
IPage<ScmPurchaseChannelVo> selectPageVo(IPage<ScmPurchaseChannel> page, @Param(Constants.WRAPPER) Wrapper<ScmPurchaseChannel> qw);
List<ScmPurchaseChannelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmPurchaseChannel> qw);
//@Update("update bus_purchase_channel set name=#{msg} where id=#{id}")
//IPage<BusPurchaseChannelVo> voPage(IPage<BusPurchaseChannel> page, @Param(Constants.WRAPPER) QueryWrapper<BusPurchaseChannel> qw);
IPage<BusPurchaseChannelVo> selectPageVo(IPage<BusPurchaseChannel> page, @Param(Constants.WRAPPER) Wrapper<BusPurchaseChannel> qw);
List<BusPurchaseChannelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusPurchaseChannel> qw);
@Select("select * from bus_purchase_channel")
List<BusPurchaseChannelVo> selectListVo();
@Select("select * from scm_purchase_channel")
List<ScmPurchaseChannelVo> selectListVo();
void choice(@Param("sid") String sid,@Param("purchaseOrderTypeKey") String purchaseOrderTypeKey,@Param("purchaseOrderTypeValue") String purchaseOrderTypeValue);
void choice(@Param("sid") String sid, @Param("purchaseOrderTypeKey") String purchaseOrderTypeKey, @Param("purchaseOrderTypeValue") String purchaseOrderTypeValue);
}

25
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelMapper.xml → anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.xml

@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelMapper">
<mapper namespace="com.yxt.anrui.scm.biz.scmpurchasechannel.ScmPurchaseChannelMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo">
SELECT
bpc.*,
bso.procDefId,
bso.procInstId
FROM
bus_purchase_channel bpc
LEFT JOIN bus_sales_order bso
ON bpc.`saleOrderSid` = bso.`sid`
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelVo">
SELECT bpc.*,
bso.procDefId,
bso.procInstId
FROM scm_purchase_channel bpc
LEFT JOIN bus_sales_order bso
ON bpc.`saleOrderSid` = bso.`sid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo">
SELECT * FROM bus_purchase_channel
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelVo">
SELECT *
FROM scm_purchase_channel
<where>
${ew.sqlSegment}
</where>
@ -26,7 +25,7 @@
<update id="choice">
UPDATE
bus_purchase_channel
scm_purchase_channel
SET purchaseOrderTypeKey = #{purchaseOrderTypeKey},
purchaseOrderTypeValue = #{purchaseOrderTypeValue},
state = 2

87
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java

@ -0,0 +1,87 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmpurchasechannel;
import com.yxt.anrui.scm.api.scmpurchasechannel.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "采购渠道选择表")
@RestController
@RequestMapping("v1/scmpurchasechannel")
public class ScmPurchaseChannelRest implements ScmPurchaseChannelFeign {
@Autowired
private ScmPurchaseChannelService scmPurchaseChannelService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmPurchaseChannelVo>> listPage(@RequestBody PagerQuery<ScmPurchaseChannelQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmPurchaseChannelVo> pv = scmPurchaseChannelService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmPurchaseChannelDto dto) {
ResultBean rb = ResultBean.fireFail();
scmPurchaseChannelService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail();
scmPurchaseChannelService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmPurchaseChannelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
ScmPurchaseChannelDetailsVo vo = scmPurchaseChannelService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean choice(List<ScmPurchaseChannelDto> dto) {
return scmPurchaseChannelService.choice(dto);
}
}

128
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

@ -0,0 +1,128 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.biz.scmpurchasechannel;
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.scmpurchasechannel.*;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ScmPurchaseChannelService extends MybatisBaseService<ScmPurchaseChannelMapper, ScmPurchaseChannel> {
private QueryWrapper<ScmPurchaseChannel> createQueryWrapper(ScmPurchaseChannelQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmPurchaseChannel> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmPurchaseChannelVo> listPageVo(PagerQuery<ScmPurchaseChannelQuery> pq) {
ScmPurchaseChannelQuery query = pq.getParams();
QueryWrapper<ScmPurchaseChannel> qw = new QueryWrapper<>();
qw.eq("bpc.state", query.getState());
qw.eq("bpc.useOrgSid", query.getUseOrgSid());
String saleOrderApproStartDate = query.getSaleOrderApproStartDate();
String saleOrderApproEndDate = query.getSaleOrderApproEndDate();
qw.apply(StringUtils.isNotBlank(saleOrderApproStartDate), "date_format (bpc.saleOrderApproDate,'%Y-%m-%d') >= date_format('" + saleOrderApproStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(saleOrderApproEndDate), "date_format (bpc.saleOrderApproDate,'%Y-%m-%d') <= date_format('" + saleOrderApproEndDate + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getSaleOrderNo())) {
qw.like("bpc.saleOrderNo", query.getSaleOrderNo());
}
if (StringUtils.isNotBlank(query.getBusinessType())) {
qw.like("bpc.businessType", query.getBusinessType());
}
if (StringUtils.isNotBlank(query.getApplyDeptSid())) {
qw.eq("bpc.applyDeptSid", query.getApplyDeptSid());
}
if (StringUtils.isNotBlank(query.getApplyPeoName())) {
qw.like("bpc.applyPeoName", query.getApplyPeoName());
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("bpc.modelName", query.getModelName());
}
if (StringUtils.isNotBlank(query.getConfigName())) {
qw.like("bpc.configName", query.getConfigName());
}
IPage<ScmPurchaseChannel> page = PagerUtil.queryToPage(pq);
IPage<ScmPurchaseChannelVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmPurchaseChannelVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmPurchaseChannelDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(ScmPurchaseChannelDto dto) {
ScmPurchaseChannel entity = new ScmPurchaseChannel();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setState(1);
baseMapper.insert(entity);
}
public void updateByDto(ScmPurchaseChannelDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmPurchaseChannel entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmPurchaseChannelDetailsVo fetchDetailsVoBySid(String sid) {
ScmPurchaseChannel entity = fetchBySid(sid);
ScmPurchaseChannelDetailsVo vo = new ScmPurchaseChannelDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean choice(List<ScmPurchaseChannelDto> dto) {
ResultBean rb = ResultBean.fireFail();
for (ScmPurchaseChannelDto scmPurchaseChannelDto : dto) {
String purchaseOrderTypeKey = scmPurchaseChannelDto.getPurchaseOrderTypeKey();
String purchaseOrderTypeValue = scmPurchaseChannelDto.getPurchaseOrderTypeValue();
String sid = scmPurchaseChannelDto.getSid();
baseMapper.choice(sid, purchaseOrderTypeKey, purchaseOrderTypeValue);
}
return rb.success().setMsg("选择成功");
}
}
Loading…
Cancel
Save