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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
c76b87cfb1 da4febf4f6
commit
d958d63e4a
34 changed files with 802 additions and 676 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. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
  2. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/AppBaseVehicleRest.java
  3. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  4. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  5. 79
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  6. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
  7. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  8. 90
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannel.java
  9. 94
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelVo.java
  10. 105
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelRest.java
  11. 147
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelService.java
  12. 40
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  13. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyDetailsVo.java
  14. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyVo.java
  15. 12
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java
  16. 46
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java
  17. 31
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java
  18. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicy.java
  19. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java
  20. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
  21. 126
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
  22. 11
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java
  23. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
  24. 77
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannel.java
  25. 18
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDetailsVo.java
  26. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelDto.java
  27. 41
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeign.java
  28. 61
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelFeignFallback.java
  29. 35
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelQuery.java
  30. 80
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmpurchasechannel/ScmPurchaseChannelVo.java
  31. 40
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.java
  32. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelMapper.xml
  33. 87
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelRest.java
  34. 128
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmpurchasechannel/ScmPurchaseChannelService.java

18
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
View File

@ -52,21 +52,21 @@ public class BaseVehicleQuery implements Query {
@ApiModelProperty(value = "采购类型")
private String manPurOrderTypeKey;
@ApiModelProperty(value = "买断结束日期")
private String solidEndDate;
@ApiModelProperty(value = "厂家入库日期")
private String priceDate;
@ApiModelProperty(value = "买断状态")
private String settlementStatus;
@ApiModelProperty(value = "厂家入库开始日期")
private String applicationDateStart;
@ApiModelProperty(value = "厂家入库结束日期")
private String applicationDateEnd;
@ApiModelProperty(value = "销售开始日期")
private String salesStartDate;
@ApiModelProperty(value = "销售结束日期")
private String salesEndDate;
@ApiModelProperty(value = "买断开始日期")
private String solidStartDate;
@ApiModelProperty(value = "买断结束日期")
private String solidEndDate;
@ApiModelProperty(value = "买断状态")
private String settlementStatus;
@ApiModelProperty(value = "排产订单编号")
private String orderingNo;
@ApiModelProperty(value = "厂家库龄")

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/AppBaseVehicleRest.java
View File

@ -37,8 +37,7 @@ public class AppBaseVehicleRest implements AppBaseVehicleFeign {
*/
@Override
public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid,String useOrgSid,String orgPath) {
AppCurrentCarDetailConfigVo vo = baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid, userSid,useOrgSid,orgPath);
return new ResultBean<AppCurrentCarDetailConfigVo>().success().setData(vo);
return baseVehicleService.getAppCurrentCarDetailConfigVo(modelSid, configSid, userSid,useOrgSid,orgPath);
}

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
View File

@ -17,21 +17,21 @@
WHEN bv.manPurOrderTypeValue = "外采"
THEN 0
WHEN bv.solidDate IS NOT NULL
THEN DATEDIFF(bv.priceDate, bv.solidDate)
THEN DATEDIFF(bv.solidDate,bv.priceDate)
WHEN bv.solidDate IS NULL
THEN DATEDIFF(bv.priceDate, NOW())
THEN DATEDIFF(NOW(),bv.priceDate)
END AS libraryAge,
CASE
WHEN bv.salesDate IS NOT NULL
THEN DATEDIFF(bv.departureDate, bv.salesDate)
THEN DATEDIFF(bv.salesDate,bv.departureDate)
WHEN bv.salesDate IS NULL
THEN DATEDIFF(bv.departureDate, NOW())
THEN DATEDIFF(NOW(),bv.departureDate)
END AS orgLibraryAge,
CASE
WHEN bv.salesDate IS NOT NULL
THEN DATEDIFF(bv.solidDate, bv.salesDate)
THEN DATEDIFF(bv.salesDate,bv.solidDate)
WHEN bv.salesDate IS NULL
THEN DATEDIFF(bv.solidDate, NOW())
THEN DATEDIFF(NOW(),bv.solidDate)
END AS settlementLibraryAge,
bv.sid,
bv.modelSid,

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
View File

@ -313,8 +313,10 @@ public class BaseVehicleRest implements BaseVehicleFeign {
if (null == baseVehicle)
baseVehicle = new BaseVehicle();
baseVehicleService.copyToBean(baseVehicleDto, baseVehicle);
//BeanUtil.copyProperties(baseVehicleDto, baseVehicle, new CopyOptions().setIgnoreNullValue(true));
//更新车辆台账的组织全路径
String purchaseSystemSid = baseVehicle.getPurchaseSystemSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(purchaseSystemSid).getData();
baseVehicle.setOrgSidPath(sysOrganizationVo.getOrgSidPath());
//更新车辆台账数据
if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
baseVehicleService.updateVeh(baseVehicle);

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

@ -49,7 +49,6 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVe
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
@ -57,12 +56,8 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
@ -198,9 +193,24 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(pagerQuery.getManPurOrderTypeKey())) {//采购类型
qw.eq("bv.manPurOrderTypeKey", pagerQuery.getManPurOrderTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getPriceDate())) {//厂家入库日期
qw.eq("bv.priceDate", pagerQuery.getPriceDate());
}
//厂家入库日期
String pricestartDate = pagerQuery.getApplicationDateStart();
String priceEndDate = pagerQuery.getApplicationDateEnd();
qw.apply(StringUtils.isNotEmpty(pricestartDate), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + pricestartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')"
);
//销售日期
String salesStartDate = pagerQuery.getSalesStartDate();
String salesEndDate = pagerQuery.getSalesEndDate();
qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')"
);
//买断日期
String solidStartDate = pagerQuery.getSolidStartDate();
String solidEndDate = pagerQuery.getSolidEndDate();
qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
}
@ -348,22 +358,27 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(pagerQuery.getManPurOrderTypeKey())) {//采购类型
qw.eq("bv.manPurOrderTypeKey", pagerQuery.getManPurOrderTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getPriceDate())) {//厂家入库日期
qw.eq("bv.priceDate", pagerQuery.getPriceDate());
}
if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
}
//厂家入库日期
String pricestartDate = pagerQuery.getApplicationDateStart();
String priceEndDate = pagerQuery.getApplicationDateEnd();
qw.apply(StringUtils.isNotEmpty(pricestartDate), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + pricestartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')"
);
//销售日期
String salesStartDate = pagerQuery.getSalesStartDate();
String salesEndDate = pagerQuery.getSalesEndDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')").
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')"
);
//买断日期
String solidStartDate = pagerQuery.getSolidStartDate();
String solidEndDate = pagerQuery.getSolidEndDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')").
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
}
//车型字段
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌
qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
@ -997,8 +1012,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param configSid
* @return
*/
public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String
public ResultBean<AppCurrentCarDetailConfigVo> getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String
userSid, String useOrgSid, String orgPath) {
ResultBean<AppCurrentCarDetailConfigVo> rb = ResultBean.fireFail();
String useOrg = "";
if (StringUtils.isNotBlank(useOrgSid)) {
useOrg = useOrgSid;
@ -1016,6 +1032,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
long time = date1.getTime();
configDetailVo.setDateLong(time);
}
}else{
return rb.setMsg("该分公司下无此车型配置");
}
configDetailVo.setVehicleTypeCode("车型信息（" + configDetailVo.getVehicleTypeCode() + "）");
configDetailVo.setConfigCode("常用配置（" + configDetailVo.getConfigCode() + "）");
@ -1084,7 +1102,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(configSid);
String modelInfoName = baseModelConfigService.configNameSpell(baseModelConfig);
configDetailVo.setModelInfoName(modelInfoName);
return configDetailVo;
return rb.success().setData(configDetailVo);
}
@ -4057,9 +4075,24 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(pagerQuery.getManPurOrderTypeKey())) {//采购类型
qw.eq("bv.manPurOrderTypeKey", pagerQuery.getManPurOrderTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getPriceDate())) {//厂家入库日期
qw.eq("bv.priceDate", pagerQuery.getPriceDate());
}
//厂家入库日期
String pricestartDate = pagerQuery.getApplicationDateStart();
String priceEndDate = pagerQuery.getApplicationDateEnd();
qw.apply(StringUtils.isNotEmpty(pricestartDate), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + pricestartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')"
);
//销售日期
String salesStartDate = pagerQuery.getSalesStartDate();
String salesEndDate = pagerQuery.getSalesEndDate();
qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')"
);
//买断日期
String solidStartDate = pagerQuery.getSolidStartDate();
String solidEndDate = pagerQuery.getSolidEndDate();
qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml
View File

@ -4,6 +4,6 @@
<select id="selectOnes" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
select *
from base_vehicle_state
where busSid = #{busSid}
where busSid = #{busSid} order by id desc limit 1
</select>
</mapper>

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -82,8 +82,22 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
baseVehicleState.setCarryVehicleState("1");
}
baseMapper.updateById(baseVehicleState);
}
}else{
if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
//销售订单办理通过后更新业务阶段为出库开票、小状态为待出库，款项状态为0
baseVehicleState.setFinState("0");
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
baseMapper.insert(baseVehicleState);
}
}
});

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

@ -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
View File

@ -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
View File

@ -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
View File

@ -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("选择成功");
}
}

40
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -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 {
@ -5643,7 +5645,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SUBMIT.getTypeKey());
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SAVEVIN.getTypeKey());
if (StringUtils.isNotBlank(list.get(i).getLinkSid())) {
baseVehicleStateDto.setVinSid(list.get(i).getLinkSid());
baseVehicleStateDto.setVinNo(list.get(i).getLinkNo());

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyDetailsVo.java
View File

@ -80,11 +80,11 @@ public class LoanCreditAppealApplyDetailsVo implements Vo {
@ApiModelProperty("申请部门名称")
private String applyDeptName;
@ApiModelProperty("销售订单sid")
private String saleOrderSid = "1b54fcc7-9909-436d-a134-03c3f5a7f7ff";
@ApiModelProperty("流程定义的id")
private String procDefId;
private String saleOrderSid;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("信用申诉人员列表")
private List<LoanCreditAppealPeoDetailsVo> loanCreditAppealPeos = new ArrayList<>();
@ApiModelProperty("申诉附件")

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancreditappealapply/LoanCreditAppealApplyVo.java
View File

@ -105,4 +105,8 @@ public class LoanCreditAppealApplyVo implements Vo {
private Boolean showHandleBtn;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
}

12
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java
View File

@ -1,11 +1,14 @@
package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -22,6 +25,11 @@ import java.util.List;
fallback = LoanFinOtherPolicyFeignFallback.class)
public interface LoanFinOtherPolicyFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<LoanFinOtherPolicyPageVo>> listPage(@RequestBody PagerQuery<LoanFinOtherPolicyQuery> pq);
@GetMapping("details")
@ApiOperation("详情")
ResultBean<LoanFinOtherPolicyVos> details(@RequestParam("sid") String sid);

46
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyPageVo.java
View File

@ -0,0 +1,46 @@
package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description: 其他融产品
* @author: dimengzhe
* @date: 2023/7/6
**/
@Data
public class LoanFinOtherPolicyPageVo implements Vo {
private String sid;
@ApiModelProperty("报备状态：1已报备，0未报备")
private int filingState;
@ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态")
private int riskState;
@ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态")
private int useSate;
@ApiModelProperty("有效期至")
private String validDateTo;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("适用销售部门名称(逗号分隔)")
private String useDeptNames;
@ApiModelProperty("产品名称：组合（资方+产品类别+最高融资比例+期数）")
private String otherPolicyName;
@ApiModelProperty("业务类型value")
private String busTypeValue;
@ApiModelProperty("车辆大类value")
private String vehCategoryValue;
@ApiModelProperty("车辆功能value")
private String vehTypeValue;
@ApiModelProperty("最高融资额")
private BigDecimal maxLoanAmount;
@ApiModelProperty("期数")
private int period;
@ApiModelProperty("年利率（%）")
private BigDecimal yearRatio;
}

31
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java
View File

@ -1,12 +1,41 @@
package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2023/7/6
**/
@Data
public class LoanFinOtherPolicyQuery {
public class LoanFinOtherPolicyQuery implements Query {
@ApiModelProperty("报备状态：1已报备，0未报备")
private int filingState;
@ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态")
private int riskState;
@ApiModelProperty("使用状态：1停用 0正常 各分公司设置的状态")
private int useSate;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("业务类型value")
private String busTypeValue;
@ApiModelProperty("车辆大类value")
private String vehCategoryValue;
@ApiModelProperty("车辆功能value")
private String vehTypeValue;
@ApiModelProperty("产品名称：组合（资方+产品类别+最高融资比例+期数）")
private String otherPolicyName;
@ApiModelProperty("开始有效期至")
private String validStartDateTo;
@ApiModelProperty("结束有效期至")
private String validEndDateTo;
@ApiModelProperty("期数")
private int period;
@ApiModelProperty("年利率（%）")
private BigDecimal yearRatio;
}

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

@ -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
View File

@ -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;
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
View File

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
@ -67,4 +68,7 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper<LoanCreditAppeal
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> map);
@Update("update loan_credit_appeal_apply set ssjg=#{ssjg} where sid=#{creditApplySid}")
void updateSsjgBySid(String ssjg, String creditApplySid);
}

126
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
View File

@ -41,6 +41,8 @@ import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -262,6 +264,8 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
LoanCreditAppealApply entity = fetchBySid(sid);
LoanCreditAppealApplyDetailsVo vo = new LoanCreditAppealApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
vo.setInstanceId(entity.getProcInstSid());
vo.setTaskId(entity.getTaskId());
String creditApplySid = entity.getCreditApplySid();
LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyService.fetchDetailsVoBySid(creditApplySid);
vo.setLoanPreloanCreditApplyDetailsVo(loanPreloanCreditApplyDetailsVo);
@ -419,6 +423,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
baseMapper.updateSsjgBySid("通过",loanCreditAppealApply.getCreditApplySid());
} else {
//极光推送
loanCreditAppealApply = fetchBySid(businessSid);
@ -445,6 +450,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
ResultBean<List<LoanCreditApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<LoanCreditApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());
@ -455,6 +461,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
ResultBean<List<LoanCreditApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.LOANCREDITAPPEALAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<LoanCreditApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanCreditApplyNodeVo.class)).collect(Collectors.toList());
@ -462,15 +469,128 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
}
public ResultBean reject(LoanCreditApplyTaskQuery query) {
return null;
ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid();
LoanCreditAppealApply loanCreditAppealApply = fetchBySid(businessSid);
if (loanCreditAppealApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = loanCreditAppealApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
loanCreditAppealApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = loanCreditAppealApply.getProcInstSid();
ufVo.setProcInsId(procId);
ufVo.setProcDefId(loanCreditAppealApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("信用审核申诉");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(loanCreditAppealApply.getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(loanCreditAppealApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
messageFlowableQuery.setMsgTitle("信用审核申诉");
messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean revokeProcess(LoanCreditApplyTaskQuery query) {
return null;
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
LoanCreditAppealApply loanCreditAppealApply = fetchBySid(query.getBusinessSid());
String businessTaskId = loanCreditAppealApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败，提交的数据不一致!");
}
public ResultBean breakProcess(LoanCreditApplyTaskQuery query) {
return null;
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误：instanceId");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误：userSid");
}
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
LoanCreditAppealApply loanCreditAppealApply = fetchBySid(query.getBusinessSid());
String businessTaskId = loanCreditAppealApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if(query.getUserSid().equals(loanCreditAppealApply.getCreateBySid())){
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
baseMapper.updateSsjgBySid("不通过",loanCreditAppealApply.getCreditApplySid());
return rb.success().setData(resultBean.getData());
}else{
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
baseMapper.updateSsjgBySid("不通过",loanCreditAppealApply.getCreditApplySid());
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
}

11
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java
View File

@ -1,9 +1,9 @@
package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyFeign;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
@ -24,6 +24,11 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
@Autowired
private LoanFinOtherPolicyService loanFinOtherPolicyService;
@Override
public ResultBean<PagerVo<LoanFinOtherPolicyPageVo>> listPage(PagerQuery<LoanFinOtherPolicyQuery> pq) {
return null;
}
@Override
public ResultBean<LoanFinOtherPolicyVos> details(String sid) {
return loanFinOtherPolicyService.details(sid);

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
View File

@ -161,7 +161,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
record.setIsDelete(false);
record.setShowDeleteBtn(false);
}
if ("002".equals(record.getGsfkjgKey())){
if ("002".equals(record.getGsfkjgKey()) && !"通过".equals(record.getSsjg())){
record.setIsHandle(true);
record.setShowHandleBtn(true);
}else {

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

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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("选择成功");
}
}
Write Preview
Loading…
Cancel
Save