From b293f99dbf543fd5af662673e3b28206d6de6871 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 22 Nov 2022 09:46:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/commoncontract/CommonContractService.java | 4 +++- .../FinCollectionConfirmationDetailsVo.java | 2 ++ .../FinCollectionConfirmationDto.java | 4 ++-- .../FinCollectionConfirmationVo.java | 4 ++-- .../FinSelectedReceivablesDetailed.java | 3 +++ .../FinSelectedReceivablesDetailedDto.java | 3 +++ .../FinUncollectedReceivablesDetailed.java | 3 +++ .../UnCollectionDto.java | 4 ++++ .../FinCollectionConfirmationMapper.java | 3 +++ .../FinCollectionConfirmationMapper.xml | 4 ++++ .../FinCollectionConfirmationService.java | 12 +++++++++--- 11 files changed, 38 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 36f21dc630..63d29bfac9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1541,6 +1541,7 @@ public class CommonContractService extends MybatisBaseService selectByState(); + + int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index ea62d4fa48..1d99763a60 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -86,4 +86,8 @@ left join fin_selected_receivables_detailed fsrd on fcc.sid = fsrd.collSid where fcc.auditState = 1 + + + update fin_collection_confirmation set balance = #{balanceBigDecimal} where sid = #{sid} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 052e3018c4..22399bda7e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -330,7 +330,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Tue, 22 Nov 2022 11:14:01 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=9C=B0=E7=82=B9?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E7=8E=AF?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleActualSalesService.java | 2 -- .../anrui/flowable/api/utils/ProcDefEnum.java | 3 ++- .../scmvehiclegression/ScmVehicleGression.java | 3 +++ .../ScmVehicleGressionService.java | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index e9ccd95704..3774b69ace 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -153,8 +153,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid()); if (!userVoResultBean.getSuccess()) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 3d28d67e6f..3bae239c26 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -30,7 +30,8 @@ public enum ProcDefEnum { BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"), BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:675012"), - SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO +// SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO + SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试 FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"), FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java index c20924eb99..42e5f72da1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java @@ -114,4 +114,7 @@ public class ScmVehicleGression extends BaseEntity { private String orgSid;*/ + private String orgSidPath; + + } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 858b35a4f4..f9d636e0d1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -393,12 +393,26 @@ public class ScmVehicleGressionService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } //获取用户信息 ResultBean userVoResultBean = sysUserFeign.fetchBySid(userSid); if (!userVoResultBean.getSuccess()) { @@ -422,6 +436,7 @@ public class ScmVehicleGressionService extends MybatisBaseService 0) { @@ -712,8 +727,10 @@ public class ScmVehicleGressionService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); From 3a7c05fd0577b93c2d5e67f0cda3064d69803251 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 22 Nov 2022 12:12:52 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0=E7=8E=AF=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busvehicleapply/BusVehicleApply.java | 3 +++ .../busvehicleapply/BusVehicleApplyDto.java | 3 +++ .../BaseVehicleActualSalesService.java | 2 +- .../BusVehicleApplyService.java | 21 ++++++++++++++++++- .../anrui/flowable/api/utils/ProcDefEnum.java | 4 ++-- .../ScmVehicleGressionService.java | 2 +- 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java index e20153a359..91c2929642 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java @@ -82,4 +82,7 @@ public class BusVehicleApply extends BaseEntity { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty("申请人的orgSidPath") + private String orgSidPath; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index c092547721..830abe2558 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -82,4 +82,7 @@ public class BusVehicleApplyDto implements Dto { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty("申请人orgSidPath") + private String orgSidPath; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 3774b69ace..9d68070634 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -192,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index f5aa1ff381..2c0808e81b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -220,6 +220,22 @@ public class BusVehicleApplyService extends MybatisBaseService rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) {//新增 + //======================================= + String orgSidPath = dto.getOrgSidPath(); + if(StringUtils.isBlank(orgSidPath)){ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } + //=========================================== BusVehicleApply entity = new BusVehicleApply(); BeanUtil.copyProperties(dto, entity, "sid"); //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号 @@ -227,6 +243,7 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList(); for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) { @@ -260,7 +277,7 @@ public class BusVehicleApplyService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -511,6 +529,7 @@ public class BusVehicleApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 3bae239c26..9808551e51 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -17,8 +17,8 @@ public enum ProcDefEnum { // BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地 // ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地 ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试 -// VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO - VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO +// VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO + VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试 // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"), diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index f9d636e0d1..d2de45733e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -450,7 +450,7 @@ public class ScmVehicleGressionService extends MybatisBaseService Date: Tue, 22 Nov 2022 14:08:37 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppAdvanceInvoiceDto.java | 2 ++ .../BusAdvanceGinvoiceapply.java | 2 ++ .../AppArrearsCarryDto.java | 2 ++ .../BusArrearsCarryVehicleApply.java | 2 ++ .../BusAdvanceGinvoiceapplyService.java | 22 ++++++++++++++++ .../BusArrearsCarryVehicleApplyService.java | 25 +++++++++++++++++-- .../FinBillApplication.java | 3 ++- .../FinBillApplicationDto.java | 2 ++ .../FinBillApplicationService.java | 17 +++++++++++++ .../anrui/flowable/api/utils/ProcDefEnum.java | 9 ++++--- 10 files changed, 80 insertions(+), 6 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java index 85732d5c78..4639fb5ee4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java @@ -49,4 +49,6 @@ public class AppAdvanceInvoiceDto implements Dto { private String taskId; @ApiModelProperty("流程实列id") private String procInsId; + @ApiModelProperty("当前用户部门的全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java index e7a5c6a55f..28237c49a3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java @@ -98,4 +98,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty(value = "当前用户部门全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java index 0367b219a3..c3cfc5371d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java @@ -41,4 +41,6 @@ public class AppArrearsCarryDto implements Dto { private String procInsId; @ApiModelProperty("用户sid") private String taskId; + @ApiModelProperty("当前用户部门的全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java index 9c15995f93..1ed5253ce7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java @@ -83,4 +83,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("当前用户部门的全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index c411e66832..94c807b509 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -518,6 +518,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); + } BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply); String sid = dto.getContractSid(); busGinvoiceapplyVehicleService.delByAdvGinSid(sid); @@ -596,6 +606,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService resultBean = saveAdvanceInvoice(dto); if (!resultBean.getSuccess()) { @@ -717,6 +729,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -821,6 +838,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 9b9002a80b..92c5123822 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -606,8 +606,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); + } //根据申请sid查询数据 BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid()); BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply); @@ -650,6 +660,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -888,6 +904,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index 69478f319a..bed9656a57 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -89,6 +89,7 @@ public class FinBillApplication extends BaseEntity { private String nodeState; @ApiModelProperty(value = "是否延迟开票") private Integer isDelayBill; - + @ApiModelProperty("当前用户部门全路径") + private String orgSidPath; private String taskId; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index a220adc3e4..b35931c891 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -93,6 +93,8 @@ public class FinBillApplicationDto implements Dto { private String isHighAndLowOpen; @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("当前用户部门全路径") + private String orgSidPath; @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 @ApiModelProperty("客户开票申请书附件信息") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 7cd332b246..c4e13bd7f0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -200,6 +200,21 @@ public class FinBillApplicationService extends MybatisBaseService saveOrUpdateDto(FinBillApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dto.getOrgSidPath())) { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); + } List finBillVehicles = dto.getFinBillVehicles(); List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); @@ -686,6 +701,7 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -868,6 +884,7 @@ public class FinBillApplicationService extends MybatisBaseService Date: Tue, 22 Nov 2022 14:21:48 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/biz/finbillapplication/FinBillApplicationService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index c4e13bd7f0..4d705c805c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -78,7 +78,6 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; -import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; From 79e2dbeeb0c576fd7b20c1c893ded9cfbaa84389 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 22 Nov 2022 15:16:18 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7191=E6=AE=B5=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java index 704983ad2d..ec0c64b74b 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java @@ -75,7 +75,7 @@ public class SysStaffinfoDto implements Dto { @ApiModelProperty(value = "住址", required = false) private String address; @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确") + @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,5,8,9])|166|(147))\\d{8}$", message = "手机号码格式不正确") @NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty(value = "邮箱", required = false) From 60b1e2f29b2ee65b7134c0e59f0288cdc4fd7eae Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 22 Nov 2022 15:20:51 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7191=E6=AE=B5=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java index ec0c64b74b..3777727beb 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java @@ -75,7 +75,7 @@ public class SysStaffinfoDto implements Dto { @ApiModelProperty(value = "住址", required = false) private String address; @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,5,8,9])|166|(147))\\d{8}$", message = "手机号码格式不正确") + @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") @NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty(value = "邮箱", required = false) From 7e1c55e57529608168b4cf61b1481489e75b1a3a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 22 Nov 2022 17:02:17 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/baseaccadjapply/BaseAccadjApply.java | 2 + .../BaseAccadjApplyDetailsVo.java | 2 + .../baseaccadjapply/BaseAccadjApplyDto.java | 2 + .../BaseDiscountpackage.java | 3 + .../BaseDiscountpackageDto.java | 3 + .../BaseDiscountpackagePageListVo.java | 3 + .../BaseDiscountpackageVo.java | 3 + .../BaseSalesDicountVo.java | 2 + .../BaseInternalPurchase.java | 2 + .../BaseInternalPurchaseDetailsVo.java | 3 + .../BaseInternalPurchaseDto.java | 2 + .../basemodelmodprice/BaseModelModprice.java | 3 + .../BaseModelModpriceDetailVo.java | 3 + .../BaseModelModpriceDto.java | 4 + .../BaseOutsourcingApplication.java | 3 + .../BaseOutsourcingApplicationDetailsVo.java | 3 + .../BaseOutsourcingApplicationDto.java | 3 + .../basevehicle/BaseChoiceVehicleQuery.java | 37 +++ .../api/basevehicle/BaseChoiceVehicleVo.java | 35 +++ .../api/basevehicle/BaseVehicleFeign.java | 10 +- .../basevehicle/BaseVehicleFeignFallback.java | 11 +- .../BaseAccadjApplyService.java | 29 ++- .../BaseDiscountpackageService.java | 27 +- .../BaseInternalPurchaseService.java | 29 ++- .../BaseModelModpriceService.java | 29 ++- .../BaseOutsourcingApplicationRest.java | 7 - .../BaseOutsourcingApplicationService.java | 38 ++- .../biz/basevehicle/BaseVehicleMapper.java | 2 + .../biz/basevehicle/BaseVehicleMapper.xml | 21 ++ .../base/biz/basevehicle/BaseVehicleRest.java | 13 +- .../biz/basevehicle/BaseVehicleService.java | 235 ++++++++--------- .../anrui/flowable/api/utils/ProcDefEnum.java | 50 ++-- .../ScmCollectionRebate.java | 8 +- .../ScmCollectionRebateDetailsVo.java | 14 +- .../ScmCollectionRebateDto.java | 14 +- .../ScmCollectionRebateQuery.java | 2 + .../ScmCollectionRebateVo.java | 8 +- .../ScmCollectionrebateCheckapplyFeign.java | 44 ++++ ...llectionrebateCheckapplyFeignFallback.java | 45 ++++ .../flow/GetNodeQuery.java | 25 ++ .../flow/GetNodeVo.java | 25 ++ ...CollectionRebateCheckApplyCompleteDto.java | 42 +++ ...cmCollectionRebateCheckApplyTaskQuery.java | 56 ++++ ...ubmitScmCollectionRebateCheckApplyDto.java | 22 ++ .../ScmCollectionRebateDistribution.java | 82 ++++++ ...CollectionRebateDistributionDetailsVo.java | 88 +++++++ .../ScmCollectionRebateDistributionDto.java | 87 +++++++ .../ScmCollectionRebateDistributionFeign.java | 78 ++++++ ...ectionRebateDistributionFeignFallback.java | 72 ++++++ .../ScmCollectionRebateDistributionQuery.java | 62 +++++ .../ScmCollectionRebateDistributionVo.java | 83 ++++++ .../ScmCollectionRebateDistributionVeh.java | 70 +++++ ...lectionRebateDistributionVehDetailsVo.java | 71 +++++ ...ScmCollectionRebateDistributionVehDto.java | 71 +++++ ...mCollectionRebateDistributionVehFeign.java | 78 ++++++ ...ionRebateDistributionVehFeignFallback.java | 72 ++++++ ...mCollectionRebateDistributionVehQuery.java | 69 +++++ .../ScmCollectionRebateDistributionVehVo.java | 71 +++++ .../ScmCollectionRebateVeh.java | 64 +++++ .../ScmCollectionRebateVehDetailsVo.java | 65 +++++ .../ScmCollectionRebateVehDto.java | 65 +++++ .../ScmCollectionRebateVehFeign.java | 83 ++++++ .../ScmCollectionRebateVehFeignFallback.java | 77 ++++++ .../ScmCollectionRebateVehQuery.java | 63 +++++ .../ScmCollectionRebateVehVo.java | 65 +++++ .../ScmCollectionRebateWithApplyVo.java | 2 + .../ScmCollectionRebateRest.java | 8 +- .../ScmCollectionRebateService.java | 47 +++- .../ScmCollectionrebateCheckapplyMapper.java | 3 + .../ScmCollectionrebateCheckapplyMapper.xml | 15 ++ .../ScmCollectionrebateCheckapplyRest.java | 52 +++- .../ScmCollectionrebateCheckapplyService.java | 242 +++++++++++++++++- ...ScmCollectionRebateDistributionMapper.java | 65 +++++ .../ScmCollectionRebateDistributionMapper.xml | 13 + .../ScmCollectionRebateDistributionRest.java | 96 +++++++ ...cmCollectionRebateDistributionService.java | 160 ++++++++++++ ...CollectionRebateDistributionVehMapper.java | 73 ++++++ ...mCollectionRebateDistributionVehMapper.xml | 13 + ...cmCollectionRebateDistributionVehRest.java | 100 ++++++++ ...ollectionRebateDistributionVehService.java | 118 +++++++++ .../ScmCollectionRebateVehMapper.java | 76 ++++++ .../ScmCollectionRebateVehMapper.xml | 13 + .../ScmCollectionRebateVehRest.java | 105 ++++++++ .../ScmCollectionRebateVehService.java | 122 +++++++++ .../ScmCollectionRebateWithApplyMapper.xml | 3 - .../ScmCollectionRebateWithApplyService.java | 2 +- 86 files changed, 3535 insertions(+), 253 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyCompleteDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyTaskQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/SubmitScmCollectionRebateCheckApplyDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.xml create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehRest.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java index f2a0f6a8d2..aef2b447e9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java @@ -78,5 +78,7 @@ public class BaseAccadjApply extends BaseEntity { private String nodeState; // 流程状态 @ApiModelProperty("taskId") private String taskId; // taskId + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java index 9a48fa7b17..12bdb2622b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java @@ -73,6 +73,8 @@ public class BaseAccadjApplyDetailsVo implements Vo { private String instanceId; // 流程实例的sid @ApiModelProperty("taskId") private String taskId; // taskId + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 @ApiModelProperty("调账车辆列表") private List baseInternalPurchaseVehicles; // 调账车辆列表 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java index 16da04c3bd..607c8eef21 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java @@ -75,6 +75,8 @@ public class BaseAccadjApplyDto implements Dto { private String createOrgSid; // 创建组织sid @ApiModelProperty("流程状态") private String nodeState; // 流程状态 + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 @ApiModelProperty("调账车辆类型sid") private List accSids; // 调账车辆类型sid } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java index 294e732b00..63cb27e993 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java @@ -71,4 +71,7 @@ public class BaseDiscountpackage extends BaseEntity { private String procInstId; @ApiModelProperty("任务id") private String taskId; + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java index e06fc2e52d..dcc536842a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java @@ -83,6 +83,9 @@ public class BaseDiscountpackageDto implements Dto { @ApiModelProperty("任务id") private String taskId; + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("销售车辆列表") private List baseDiscountpackageVehs; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java index aecd755de9..8acf30d700 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java @@ -56,4 +56,7 @@ public class BaseDiscountpackagePageListVo implements Vo { private String procInstId; @ApiModelProperty("任务id") private String taskId; + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java index fe6e554608..96542c921a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java @@ -81,6 +81,9 @@ public class BaseDiscountpackageVo implements Vo { @ApiModelProperty("任务id") private String taskId; + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("销售车辆列表") private List baseDiscountpackageVehs; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java index f6a2ceb147..4e7e63066c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java @@ -31,4 +31,6 @@ public class BaseSalesDicountVo implements Vo { @ApiModelProperty("是否有效") private String isEmploy; + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java index 836da9c17c..8c0a808902 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java @@ -90,4 +90,6 @@ public class BaseInternalPurchase extends BaseEntity { private String callInBuyerOrgSid; // 调入方采购部门sid @ApiModelProperty("调入方采购部门名称") private String callInBuyerOrgName; // 调入方采购部门名称 + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java index 646e8432a8..8efbcfc167 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java @@ -102,6 +102,9 @@ public class BaseInternalPurchaseDetailsVo implements Vo { private String callInBuyerOrgSid; // 调入方采购部门sid @ApiModelProperty("调入方采购部门名称") private String callInBuyerOrgName; // 调入方采购部门名称 + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 @ApiModelProperty("内购车辆列表") private List baseInternalPurchaseVehicles; // 内购车辆列表 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java index 2f87ca1672..d613d2f60c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java @@ -86,6 +86,8 @@ public class BaseInternalPurchaseDto implements Dto { private String callInBuyerOrgSid; // 调入方采购部门sid @ApiModelProperty("调入方采购部门名称") private String callInBuyerOrgName; // 调入方采购部门名称 + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 @ApiModelProperty("内购车辆列表") private List baseInternalPurchaseVehicles; // 内购车辆列表 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java index 413b456d8c..a7ce4d3302 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java @@ -79,4 +79,7 @@ public class BaseModelModprice extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java index 82283b65fb..d235ce84c6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java @@ -73,6 +73,9 @@ public class BaseModelModpriceDetailVo implements Vo { private String createBySid; @ApiModelProperty(value = "使用组织sid") private String useOrgSid; + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 @ApiModelProperty("调价申请车型列表") private List baseModelModpriceModels; // 调价申请车型列表 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java index 1486f5f6f1..9c5815cf28 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java @@ -64,6 +64,10 @@ public class BaseModelModpriceDto implements Dto { private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 + @ApiModelProperty("调价申请车型列表") private List baseModelModpriceModels; // 调价申请车型列表 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index a346209b55..7232fb438e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -157,4 +157,7 @@ public class BaseOutsourcingApplication extends BaseEntity { private String approvalSid; // 销售经理sid @ApiModelProperty("销售经理姓名") private String approvalName; // 销售经理姓名 + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java index 66dd49d4f9..c0933d8684 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java @@ -163,4 +163,7 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo { private String approvalSid; // 销售经理sid @ApiModelProperty("销售经理姓名") private String approvalName; // 销售经理姓名 + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index 10dd29e319..6b71cc040a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -182,4 +182,7 @@ public class BaseOutsourcingApplicationDto implements Dto { private List baseOutsourcingApplicationVehicleDtos; // 外采车辆列表 @ApiModelProperty("合同附件信息") private CommonAppendix contract; + + @ApiModelProperty("申请人组织路径") + private String orgSidPath; // 申请人组织路径 } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java new file mode 100644 index 0000000000..e343136bce --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:26 + * @Description 采购退库选择车辆数据对象 + */ +@Data +public class BaseChoiceVehicleQuery implements Query { + + @ApiModelProperty(value = "品牌sid") + private String brandSid; + @ApiModelProperty(value = "车型名称和编码") + private String modelNameAndCode; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty("车身颜色key") + private String carColorKey; + @ApiModelProperty("存放地点sid") + private String location; + + @ApiModelProperty(value = "已选择的车辆的车架号") + private List vinNoList = new ArrayList<>(); + @ApiModelProperty(value = "用户sid") + private String userSid; + + @ApiModelProperty(value = "调入分公司sid") + private String buyerOrgSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java new file mode 100644 index 0000000000..78a7fb3a98 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:26 + * @Description 采购退库选择车辆数据对象 + */ +@Data +public class BaseChoiceVehicleVo implements Vo { + + private String sid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "颜色") + private String color; + @ApiModelProperty(value = "存放地点") + private String location; + @ApiModelProperty(value = "厂家结算价") + private String guidedPrice; + + @ApiModelProperty(value = "车型sid") + private String carModelSid; + @ApiModelProperty(value = "入库日期") + private String priceDate; + @ApiModelProperty(value = "销售日期") + private String salesDate; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index c0cef9da62..d71f941828 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -269,7 +269,7 @@ public interface BaseVehicleFeign { @ApiOperation("采购退库选择车辆分页列表") @PostMapping("/vehicleReturnList") - ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); + ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); @ApiOperation("客户查询选择车辆分页列表") @PostMapping("/vehicleCrmList") @@ -289,11 +289,15 @@ public interface BaseVehicleFeign { @ApiOperation("未售买断选择车辆分页列表") @PostMapping("/vehicleActualList") - ResultBean> vehicleActualList(@RequestBody PagerQuery pagerQuery); + ResultBean> vehicleActualList(@RequestBody PagerQuery pagerQuery); @ApiOperation("调车申请选择车辆分页列表") @PostMapping("/vehiclePurchaseList") - ResultBean> vehiclePurchaseList(@RequestBody PagerQuery pagerQuery); + ResultBean> vehiclePurchaseList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("回款返利选择车辆分页列表") + @PostMapping("/vehicleCollectionList") + ResultBean> vehicleCollectionList(@RequestBody PagerQuery pagerQuery); @ApiOperation("调车申请查询调出分公司车架号和库存地点") @PostMapping("/purSellVinNoAndLoc") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 86b72bece1..2f25b461ea 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -152,7 +152,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { return null; } @@ -177,12 +177,17 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { } @Override - public ResultBean> vehicleActualList(PagerQuery pagerQuery) { + public ResultBean> vehicleActualList(PagerQuery pagerQuery) { return null; } @Override - public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean> vehicleCollectionList(PagerQuery pagerQuery) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 45de37bde6..90c728b077 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -169,10 +169,23 @@ public class BaseAccadjApplyService extends MybatisBaseService saveOrUpdateDto(BaseAccadjApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); List accSids = dto.getAccSids(); if (StringUtils.isBlank(dtoSid)) {//新增 dto.setApplyDate(DateUtil.today()); dto.setNodeState("待提交"); + dto.setOrgSidPath(orgSidPath); ResultBean resultBean = this.insertByDto(dto); String sid = (String) resultBean.getData(); for (String accSid : accSids) { @@ -187,6 +200,7 @@ public class BaseAccadjApplyService extends MybatisBaseService purchaseSids = dto.getAccSids(); - //根据用户sid获取staffSid - ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); BaseAccadjApply baseAccadjApply = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, baseAccadjApply); if (r == 3) { @@ -315,8 +317,9 @@ public class BaseAccadjApplyService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); //若有网关，则赋值网关中判断的字段。 variables.put("businessSid", businessSid); + BaseAccadjApply baseAccadjApply1 = fetchBySid(businessSid); //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); + bv.setOrgSidPath(baseAccadjApply1.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); //用户sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index fb43a28bcc..914b43bcf6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -128,6 +128,13 @@ public class BaseDiscountpackageService extends MybatisBaseService orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); BaseDiscountpackage entity = new BaseDiscountpackage(); String orgSid = ""; ResultBean stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid()); @@ -138,6 +145,7 @@ public class BaseDiscountpackageService extends MybatisBaseService baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs(); for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) { @@ -161,6 +169,14 @@ public class BaseDiscountpackageService extends MybatisBaseService orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); this.updateBySid(dto.toMap(), sid); baseDiscountpackageVehService.deleteByMainSid(sid); List baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs(); @@ -410,13 +426,7 @@ public class BaseDiscountpackageService extends MybatisBaseService orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); - } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, baseDiscountpackage); if (r == 3) { @@ -450,8 +460,9 @@ public class BaseDiscountpackageService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + BaseDiscountpackage baseDiscountpackage1 = fetchBySid(businessSid); //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); + bv.setOrgSidPath(baseDiscountpackage1.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); //用户sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 64c6b6acce..2b7969f959 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -204,6 +204,18 @@ public class BaseInternalPurchaseService extends MybatisBaseService saveAll(BaseInternalPurchaseDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); List baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles(); if (baseInternalPurchaseVehicles.size() < 1) { return rb.setMsg("请选择调车申请车辆"); @@ -227,6 +239,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); - } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); BaseInternalPurchase baseInternalPurchase = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, baseInternalPurchase); if (r == 3) { @@ -342,8 +344,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + BaseInternalPurchase baseInternalPurchase1 = fetchBySid(businessSid); //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); + bv.setOrgSidPath(baseInternalPurchase1.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); //用户sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 5749fd3671..432ab32eb0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -126,6 +126,18 @@ public class BaseModelModpriceService extends MybatisBaseService saveOrUpdateAll(BaseModelModpriceDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); List baseModelModpriceModels = dto.getBaseModelModpriceModels(); if (StringUtils.isBlank(sid)) {//新增 BaseModelModprice baseModelModprice = new BaseModelModprice(); @@ -134,6 +146,7 @@ public class BaseModelModpriceService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!orgByStaffSid.getSuccess()) { - return rb.setMsg(orgByStaffSid.getMsg()); - } - //用户的组织全路径 - String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); BaseModelModprice baseModelModprice = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, baseModelModprice); if (r == 3) { @@ -234,8 +236,9 @@ public class BaseModelModpriceService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); //若有网关，则赋值网关中判断的字段。 variables.put("businessSid", businessSid); + BaseModelModprice baseModelModprice1 = fetchBySid(businessSid); //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); + bv.setOrgSidPath(baseModelModprice1.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); //用户sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java index 1549692720..38787a55c6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java @@ -120,13 +120,6 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio public ResultBean complete( BusinessVariablesDto bvd) { BusinessVariables bv=new BusinessVariables(); BeanUtil.copyProperties(bvd,bv); - /*bv.setUserSid(bvd.getUserSid()); - bv.setOrgSidPath(bvd.getOrgSidPath()); - bv.setTaskDefKey(bvd.getTaskDefKey()); - bv.setTaskId(bvd.getTaskId()); - bv.setInstanceId(bvd.getInstanceId()); - bv.setComment(bvd.getComment()); - bv.setBusinessSid(bvd.getBusinessSid());*/ bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId()); bv.setFormVariables(BeanUtil.beanToMap(bvd)); return baseOutsourcingApplicationService.complete(bv); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 781c63dbca..dbb2fe4175 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -196,6 +196,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos(); CommonAppendix contract = dto.getContract(); @@ -252,6 +255,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); String busSid = dto.getBusinessSid(); if (StringUtils.isBlank(busSid)) { - /* String billNo = getApplyCode(dto.getUserSid()); - dto.setApplicationCode(billNo); */ ResultBean resultBean = saveOrUpdateDto(dto);//insert String businessSid = resultBean.getData().toString(); + BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setOrgSidPath(orgSidPath); + bv.setOrgSidPath(baseOutsourcingApplication.getOrgSidPath()); bv.setBusinessSid(businessSid); bv.setUserSid(dto.getUserSid()); //================添加app参数开始 @@ -429,7 +430,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); BaseOutsourcingApplicationDto booad = baseMapper.getBySid(businessSid); String businessTaskid = booad.getTaskId(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setOrgSidPath(orgSidPath); + bv.setOrgSidPath(booad.getOrgSidPath()); bv.setBusinessSid(businessSid); bv.setUserSid(dto.getUserSid()); //================添加app参数开始 @@ -551,10 +551,17 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", bv.getBusinessSid()); + if("1".equals(booad.getIsSaleOrgApproval())){ + isAdj = true; + appMap.put("isAdj",isAdj); + }else { + appMap.put("isAdj",isAdj); + } bv.getFormVariables().put("app", appMap); //================添加app相关参数 BaseOutsourcingApplicationDto dto = baseMapper.getBySid(bv.getBusinessSid()); @@ -876,10 +883,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); + BaseOutsourcingApplication booad = fetchBySid(dto.getSid()); + Boolean isAdj = false; BusinessVariables bv = new BusinessVariables(); bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId()); bv.setTaskDefKey(dto.getTaskDefKey()); - bv.setFormVariables(BeanUtil.beanToMap(dto)); + Map map = BeanUtil.beanToMap(dto); + if("1".equals(booad.getIsSaleOrgApproval())){ + isAdj = true; + map.put("isAdj",isAdj); + }else { + map.put("isAdj",isAdj); + } + bv.setFormVariables(map); ResultBean>> processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv); processCirculationNodesByMap.setCode("200"); processCirculationNodesByMap.setSuccess(true); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 61801564a6..72fd796d39 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -475,4 +475,6 @@ public interface BaseVehicleMapper extends BaseMapper { IPage vehicleCrmPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); IPage baseDisCountPackageGetVeh(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage vehicleCollectionPageList(IPage page, QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 5ab19be2ac..3672cd2887 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1344,4 +1344,25 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 096fa9db72..687637e818 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -752,7 +752,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { * @return */ @Override - public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerVo pv = baseVehicleService.vehicleReturnList(pagerQuery); return rb.success().setData(pv); @@ -781,19 +781,26 @@ public class BaseVehicleRest implements BaseVehicleFeign { } @Override - public ResultBean> vehicleActualList(PagerQuery pagerQuery) { + public ResultBean> vehicleActualList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerVo pv = baseVehicleService.vehicleActualList(pagerQuery); return rb.success().setData(pv); } @Override - public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { + public ResultBean> vehiclePurchaseList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerVo pv = baseVehicleService.vehiclePurchaseList(pagerQuery); return rb.success().setData(pv); } + @Override + public ResultBean> vehicleCollectionList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehicleCollectionList(pagerQuery); + return rb.success().setData(pv); + } + @Override public ResultBean>> purSellVinNoAndLoc(String sellerOrgSid) { return baseVehicleService.purSellVinNoAndLoc(sellerOrgSid); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 4adc0cf9f7..ca07f12939 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -41,6 +41,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign; import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; @@ -111,6 +114,8 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnList(PagerQuery pagerQuery) { + public PagerVo vehicleReturnList(PagerQuery pagerQuery) { IPage page = vehicleReturnPageList(pagerQuery); PagerVo pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); @@ -1483,7 +1488,7 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnPageList(PagerQuery pagerQuery) { + private IPage vehicleReturnPageList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = vehicleReturnWrapper(pagerQuery.getParams()); return baseMapper.vehicleReturnPageList(page, qw); @@ -1495,7 +1500,7 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnWrapper(BaseVehicleReturnQuery params) { + private QueryWrapper vehicleReturnWrapper(BaseChoiceVehicleQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { if (StringUtils.isNotBlank(params.getUserSid())) { @@ -1506,45 +1511,21 @@ public class BaseVehicleService extends MybatisBaseService wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } - //燃料 - if (StringUtils.isNotBlank(params.getFuelType())) { - qw.eq("bvm.fuelType", params.getFuelType()); + // 车架号 + if (StringUtils.isNotBlank(params.getVinNo())){ + qw.like("bv.vinNo",params.getVinNo()); } - //版本 - if (StringUtils.isNotBlank(params.getVehicleVersion())) { - qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + // 颜色 + if (StringUtils.isNotBlank(params.getCarColorKey())){ + qw.eq("bmc.carColorKey",params.getCarColorKey()); } - //车型 - if (StringUtils.isNotBlank(params.getVehicleAlias())) { - qw.like("bvm.vehicleAlias", params.getVehicleAlias()); - } - //快捷检索车型 - if (StringUtils.isNotBlank(params.getModelName())) { - qw.like("bvm.modelName", params.getModelName()); + // 存放地点 + if (StringUtils.isNotBlank(params.getLocation())){ + qw.eq("bv.location",params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); @@ -1552,7 +1533,6 @@ public class BaseVehicleService extends MybatisBaseService wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); //库存状态：库存或调出或内销 qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode())); //买断状态：未买断 @@ -1560,8 +1540,6 @@ public class BaseVehicleService extends MybatisBaseService vehicleActualList(PagerQuery pagerQuery) { + public PagerVo vehicleActualList(PagerQuery pagerQuery) { IPage page = vehicleActualPageList(pagerQuery); PagerVo pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); @@ -1661,7 +1639,7 @@ public class BaseVehicleService extends MybatisBaseService vehiclePurchaseList(PagerQuery pagerQuery) { + public PagerVo vehiclePurchaseList(PagerQuery pagerQuery) { IPage page = vehiclePurchasePageList(pagerQuery); /*List records = page.getRecords(); for (BaseVehiclePurchaseVo record : records) { @@ -1686,13 +1664,13 @@ public class BaseVehicleService extends MybatisBaseService vehiclePurchasePageList(PagerQuery pagerQuery) { + private IPage vehiclePurchasePageList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = vehiclePurchaseWrapper(pagerQuery.getParams()); return baseMapper.vehiclePurchasePageList(page, qw); } - private QueryWrapper vehiclePurchaseWrapper(BaseVehiclePurchaseQuery params) { + private QueryWrapper vehiclePurchaseWrapper(BaseChoiceVehicleQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { //品牌 @@ -1701,45 +1679,25 @@ public class BaseVehicleService extends MybatisBaseService wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } - //版本 - if (StringUtils.isNotBlank(params.getVehicleVersion())) { - qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + // 车架号 + if (StringUtils.isNotBlank(params.getVinNo())){ + qw.like("bv.vinNo",params.getVinNo()); } - //车型 - if (StringUtils.isNotBlank(params.getVehicleAlias())) { - qw.like("bvm.vehicleAlias", params.getVehicleAlias()); + // 颜色 + if (StringUtils.isNotBlank(params.getCarColorKey())){ + qw.eq("bmc.carColorKey",params.getCarColorKey()); } - //快捷检索车型 - if (StringUtils.isNotBlank(params.getModelName())) { - qw.like("bvm.modelName", params.getModelName()); + // 存放地点 + if (StringUtils.isNotBlank(params.getLocation())){ + qw.eq("bv.location",params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); @@ -1751,8 +1709,6 @@ public class BaseVehicleService extends MybatisBaseService vehicleActualPageList(PagerQuery pagerQuery) { + private IPage vehicleActualPageList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = vehicleActualWrapper(pagerQuery.getParams()); return baseMapper.vehicleActualPageList(page, qw); @@ -1775,58 +1731,33 @@ public class BaseVehicleService extends MybatisBaseService vehicleActualWrapper(BaseVehicleReturnQuery params) { + private QueryWrapper vehicleActualWrapper(BaseChoiceVehicleQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { //本分公司 if (StringUtils.isNotBlank(params.getUserSid())) { String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); qw.eq("bv.createOrgSid", orgSid); - } //品牌 if (StringUtils.isNotBlank(params.getBrandSid())) { qw.eq("bvm.carBrand", params.getBrandSid()); } - //功能 - if (StringUtils.isNotBlank(params.getVehicleType())) { - qw.eq("bvm.vehicleType", params.getVehicleType()); - } - //系列 - if (StringUtils.isNotBlank(params.getProductLine())) { - qw.eq("bvm.productLine", params.getProductLine()); - } - //变速箱 - if (StringUtils.isNotBlank(params.getGearboxType())) { - qw.eq("bvm.gearboxType", params.getGearboxType()); - } - //驱动 - if (StringUtils.isNotBlank(params.getDriveForm())) { - qw.eq("bvm.driveForm", params.getDriveForm()); - } - //排放标准 - if (StringUtils.isNotBlank(params.getEmissionStandard())) { - qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + //车型 + if (StringUtils.isNotBlank(params.getModelNameAndCode())) { + qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); } - //马力 - if (StringUtils.isNotBlank(params.getPower())) { - qw.eq("bvm.power", params.getPower()); + // 车架号 + if (StringUtils.isNotBlank(params.getVinNo())){ + qw.like("bv.vinNo",params.getVinNo()); } - //燃料 - if (StringUtils.isNotBlank(params.getFuelType())) { - qw.eq("bvm.fuelType", params.getFuelType()); + // 颜色 + if (StringUtils.isNotBlank(params.getCarColorKey())){ + qw.eq("bmc.carColorKey",params.getCarColorKey()); } - //版本 - if (StringUtils.isNotBlank(params.getVehicleVersion())) { - qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); - } - //车型 - if (StringUtils.isNotBlank(params.getVehicleAlias())) { - qw.like("bvm.vehicleAlias", params.getVehicleAlias()); - } - //快捷检索车型 - if (StringUtils.isNotBlank(params.getModelName())) { - qw.like("bvm.modelName", params.getModelName()); + // 存放地点 + if (StringUtils.isNotBlank(params.getLocation())){ + qw.eq("bv.location",params.getLocation()); } if (params.getVinNoList().size() > 0) { qw.notIn("bv.vinNo", params.getVinNoList()); @@ -1840,11 +1771,7 @@ public class BaseVehicleService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public PagerVo vehicleCollectionList(PagerQuery pagerQuery) { + IPage page = vehicleCollectionPageList(pagerQuery); + List records = page.getRecords(); + List newRecords = new ArrayList<>(); + for (BaseChoiceVehicleVo record : records) { + ScmCollectionRebateVehDetailsVo scmCollectionRebateVehDetailsVo = scmCollectionRebateVehFeign.fetchByVehSid(record.getVinNo()); + if (scmCollectionRebateVehDetailsVo == null){ + newRecords.add(record); + } + } + page.setRecords(newRecords); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage vehicleCollectionPageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = new QueryWrapper<>(); + BaseChoiceVehicleQuery params = pagerQuery.getParams(); + if (params != null) { + //品牌 + qw.eq("bvm.carBrand", params.getBrandSid()); + if (StringUtils.isNotBlank(params.getUserSid())) { + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + qw.eq("bv.useOrgSid", orgSid); + } + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //车型 + if (StringUtils.isNotBlank(params.getModelNameAndCode())) { + qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode())); + } + // 车架号 + if (StringUtils.isNotBlank(params.getVinNo())){ + qw.like("bv.vinNo",params.getVinNo()); + } + // 颜色 + if (StringUtils.isNotBlank(params.getCarColorKey())){ + qw.eq("bmc.carColorKey",params.getCarColorKey()); + } + // 存放地点 + if (StringUtils.isNotBlank(params.getLocation())){ + qw.eq("bv.location",params.getLocation()); + } + if (params.getVinNoList().size() > 0) { + qw.notIn("bv.vinNo", params.getVinNoList()); + } + qw.eq("bv.isDelete", 0); + qw.eq("bv.vehicleState",VehicleState.StockEnum.OUT_STOCK.getCode()); + } + return baseMapper.vehicleCollectionPageList(page, qw); + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 69f3616199..0a06ca43ae 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -8,43 +8,43 @@ public enum ProcDefEnum { ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), -// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), + // CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), //SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id - SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:822504"),//测试销售政策流程定义id + SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), -// ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), + // ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试 -// BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地 + // BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地 // ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地 ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试 -// VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO + // VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO - SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"), - SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ), + SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id + SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo -// SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"), + // SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"), SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), - BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO - BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"), - BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:675012"), + BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id + BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id + BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:867512"),//测试调车流程定义id SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO - FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"), - FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), - BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"), - BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:717504"), //测试调账流程定义id + FINCOSTAPPLY("费用申请", "process_u0pahv0s:5:457512"), + FINPAYAPPLY("付款申请", "process_gin2tntb:3:457508"), + BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:2:357504"), + BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id //BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id - BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"), - BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"), - SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"), - SCMVEHREBATECHECKAPPLY("单车返利核对申请","process_3xtbbru8:1:560004"), - SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"), - SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"), - SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请","process_h3w1aval:1:615004"), - SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"), - SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"), - CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"), + BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), + BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), + SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"), + SCMVEHREBATECHECKAPPLY("单车返利核对申请", "process_3xtbbru8:1:560004"), + SCMSPECIALREBATEWITHAPPLY("专项返利预提申请", "process_l0yxpgs2:1:590004"), + SCMSPECIALREBATECHECKAPPLY("专项返利核对申请", "process_qw22vupn:1:590008"), + SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请", "process_h3w1aval:1:615004"), + SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), + SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), + CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"), ; ProcDefEnum(String proDefName, String proDefId) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java index 132f2023a4..51bfb6d428 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java @@ -58,8 +58,10 @@ public class ScmCollectionRebate extends BaseEntity { private String collectionTypeKey; // 回款方式key @ApiModelProperty("回款方式value") private String collectionTypeValue; // 回款方式value - @ApiModelProperty("厂家销售通路") - private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value @ApiModelProperty("回款金额") private String collectionMoney; // 回款金额 @ApiModelProperty("运费") @@ -88,5 +90,7 @@ public class ScmCollectionRebate extends BaseEntity { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + @ApiModelProperty("是否减运费") + private String isReduceFreight; // 是否减运费 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java index ebc54405e7..be3ebd2431 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java @@ -27,6 +27,8 @@ package com.yxt.anrui.scm.api.scmcollectionrebate; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -34,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * Project: anrui-scm(回款返利)
@@ -69,8 +72,10 @@ public class ScmCollectionRebateDetailsVo implements Vo { private String collectionTypeKey; // 回款方式key @ApiModelProperty("回款方式value") private String collectionTypeValue; // 回款方式value - @ApiModelProperty("厂家销售通路") - private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value @ApiModelProperty("回款金额") private String collectionMoney; // 回款金额 @ApiModelProperty("运费") @@ -99,5 +104,8 @@ public class ScmCollectionRebateDetailsVo implements Vo { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - + @ApiModelProperty("是否减运费") + private String isReduceFreight; // 是否减运费 + @ApiModelProperty("回款返利车辆列表") + private List scmCollectionRebateVehs; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java index e7ca791498..71dbbca219 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java @@ -26,12 +26,15 @@ package com.yxt.anrui.scm.api.scmcollectionrebate; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui-scm(回款返利)
* File: ScmCollectionRebateDto.java
@@ -63,8 +66,10 @@ public class ScmCollectionRebateDto implements Dto { private String collectionTypeKey; // 回款方式key @ApiModelProperty("回款方式value") private String collectionTypeValue; // 回款方式value - @ApiModelProperty("厂家销售通路") - private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value @ApiModelProperty("回款金额") private String collectionMoney; // 回款金额 @ApiModelProperty("运费") @@ -93,5 +98,8 @@ public class ScmCollectionRebateDto implements Dto { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - + @ApiModelProperty("是否减运费") + private String isReduceFreight; // 是否减运费 + @ApiModelProperty("回款返利车辆列表") + private List scmCollectionRebateVehs; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java index 66907d5646..e4079eac04 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java @@ -51,6 +51,8 @@ import java.util.List; @ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件") public class ScmCollectionRebateQuery implements Query { + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid @ApiModelProperty("回款方式key") private String collectionTypeKey; // 回款方式key @ApiModelProperty("回款开始日期") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java index e9ba51f86b..3109b1da59 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java @@ -64,8 +64,10 @@ public class ScmCollectionRebateVo implements Vo { private String collectionTypeKey; // 回款方式key @ApiModelProperty("回款方式value") private String collectionTypeValue; // 回款方式value - @ApiModelProperty("厂家销售通路") - private String manufaSaleChannel; // 厂家销售通路 + @ApiModelProperty("厂家销售通路key") + private String manufaSaleChannel; // 厂家销售通路key + @ApiModelProperty("厂家销售通路value") + private String manufaSaleChannelValue; // 厂家销售通路value @ApiModelProperty("回款金额") private String collectionMoney; // 回款金额 @ApiModelProperty("运费") @@ -98,6 +100,8 @@ public class ScmCollectionRebateVo implements Vo { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 + @ApiModelProperty("是否减运费") + private String isReduceFreight; // 是否减运费 @ApiModelProperty("上传状态(2未上传、3已上传)") private String uploadState; // 上传状态 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java index 982b38da2f..edfe63823d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java @@ -25,14 +25,22 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; 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.ApiParam; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -75,4 +83,40 @@ public interface ScmCollectionrebateCheckapplyFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + /**************************************回款返利核对审批流程*******************************************/ + + @ApiOperation("提交回款返利核对申请") + @PostMapping("/submitCollectionRebateCheckApply") + public ResultBean submitCollectionRebateCheckApply(@RequestBody @Valid SubmitScmCollectionRebateCheckApplyDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody ScmCollectionRebateCheckApplyCompleteDto dto); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "流程历史流转记录") + @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") + public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + + } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java index 6ea8bca047..93f35886b6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java @@ -25,6 +25,11 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,4 +74,44 @@ public class ScmCollectionrebateCheckapplyFeignFallback implements ScmCollection ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean submitCollectionRebateCheckApply(SubmitScmCollectionRebateCheckApplyDto dto) { + return null; + } + + @Override + public ResultBean complete(ScmCollectionRebateCheckApplyCompleteDto dto) { + return null; + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeQuery.java new file mode 100644 index 0000000000..770c90bff6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 10:42 + * @Description + */ +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -5674867230708197611L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeVo.java new file mode 100644 index 0000000000..c9c7b70121 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 11:09 + * @Description + */ +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8802774014747063504L; + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyCompleteDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyCompleteDto.java new file mode 100644 index 0000000000..0b097307b6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyCompleteDto.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 9:01 + * @Description + */ +@Data +public class ScmCollectionRebateCheckApplyCompleteDto implements Dto { + private static final long serialVersionUID = 3240453987322803352L; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "参数错误：orgSidPath") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") +// @NotBlank(message = "参数错误：comment") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables = new HashMap<>(); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyTaskQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyTaskQuery.java new file mode 100644 index 0000000000..fdde7e5c89 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyTaskQuery.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/6/28 17:29 + * @Description 终止、撤回、驳回查询参数 + */ +@Data +public class ScmCollectionRebateCheckApplyTaskQuery implements Query { + private static final long serialVersionUID = -4006020771892400451L; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + private String instanceId; + /*@ApiModelProperty("用户Id") + private String userId; + @ApiModelProperty("节点") + private String targetKey; + @ApiModelProperty("流程变量信息") + private Map values = new HashMap<>(); + @ApiModelProperty("审批人") + private String assignee; + @ApiModelProperty("候选人") + private List candidateUsers = new ArrayList<>(); + @ApiModelProperty("审批组") + private List candidateGroups = new ArrayList<>();*/ +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/SubmitScmCollectionRebateCheckApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/SubmitScmCollectionRebateCheckApplyDto.java new file mode 100644 index 0000000000..c731865473 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/SubmitScmCollectionRebateCheckApplyDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow; + +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/27 13:38 + * @Description + */ +@Data +public class SubmitScmCollectionRebateCheckApplyDto extends ScmCollectionrebateCheckapplyDto { + private static final long serialVersionUID = 378585162071125756L; + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java new file mode 100644 index 0000000000..67ae262b92 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + +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-scm(回款返利分配)
+ * File: ScmCollectionRebateDistribution.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution
+ * Description: 回款返利分配表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配表", description = "回款返利分配表") +@TableName("scm_collection_rebate_distribution") +public class ScmCollectionRebateDistribution extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("预提申请") + private String withholdingApply; // 预提申请 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("预提返利") + private String estimateRebate; // 预提返利 + @ApiModelProperty("分摊参考比例") + private String shareGinExaProportion; // 分摊参考比例 + @ApiModelProperty("分摊比例") + private String shareProportion; // 分摊比例 + @ApiModelProperty("分摊返利总额") + private String shareRebateTotal; // 分摊返利总额 + @ApiModelProperty("本次返利余额") + private String thisRebateBalance; // 本次返利余额 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("分配状态") + private String distributionState; // 分配状态 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java new file mode 100644 index 0000000000..4b8a8cb962 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java @@ -0,0 +1,88 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + + +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo
+ * Description: 回款返利分配表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配表 视图数据详情", description = "回款返利分配表 视图数据详情") +public class ScmCollectionRebateDistributionDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("预提申请") + private String withholdingApply; // 预提申请 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("预提返利") + private String estimateRebate; // 预提返利 + @ApiModelProperty("分摊参考比例") + private String shareGinExaProportion; // 分摊参考比例 + @ApiModelProperty("分摊比例") + private String shareProportion; // 分摊比例 + @ApiModelProperty("分摊返利总额") + private String shareRebateTotal; // 分摊返利总额 + @ApiModelProperty("本次返利余额") + private String thisRebateBalance; // 本次返利余额 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("分配状态") + private String distributionState; // 分配状态 + @ApiModelProperty("回款返利分配车辆列表") + private List scmCollectionRebateDistributionVehs; // 回款返利分配车辆列表 +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java new file mode 100644 index 0000000000..efe4e0b20b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + + +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDto
+ * Description: 回款返利分配表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配表 数据传输对象", description = "回款返利分配表 数据传输对象") +public class ScmCollectionRebateDistributionDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("预提申请") + private String withholdingApply; // 预提申请 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("预提返利") + private String estimateRebate; // 预提返利 + @ApiModelProperty("分摊参考比例") + private String shareGinExaProportion; // 分摊参考比例 + @ApiModelProperty("分摊比例") + private String shareProportion; // 分摊比例 + @ApiModelProperty("分摊返利总额") + private String shareRebateTotal; // 分摊返利总额 + @ApiModelProperty("本次返利余额") + private String thisRebateBalance; // 本次返利余额 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("分配状态") + private String distributionState; // 分配状态 + @ApiModelProperty("回款返利分配车辆列表") + private List scmCollectionRebateDistributionVehs; // 回款返利分配车辆列表 +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java new file mode 100644 index 0000000000..f0d0a8ea10 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + +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 org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeign
+ * Description: 回款返利分配表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利分配表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionRebateDistribution", + name = "anrui-scm", + path = "v1/scmcollectionrebatedistribution", + fallback = ScmCollectionRebateDistributionFeignFallback.class) +public interface ScmCollectionRebateDistributionFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionRebateDistributionDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java new file mode 100644 index 0000000000..b099d7e4a9 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeignFallback
+ * Description: 回款返利分配表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionRebateDistributionFeignFallback implements ScmCollectionRebateDistributionFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatedistribution/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionRebateDistributionDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistribution/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistribution/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatedistribution/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java new file mode 100644 index 0000000000..04c8d94dbd --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionQuery
+ * Description: 回款返利分配表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配表 查询条件", description = "回款返利分配表 查询条件") +public class ScmCollectionRebateDistributionQuery implements Query { + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("预提开始标题") + private String withholdingStartApply; // 预提开始标题 + @ApiModelProperty("预提结束标题") + private String withholdingEndApply; // 预提结束标题 + @ApiModelProperty("创建开始日期") + private String createStartTime; // 创建开始日期 + @ApiModelProperty("创建结束日期") + private String createEndTime; // 创建结束日期 +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java new file mode 100644 index 0000000000..3754153f11 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistribution; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo
+ * Description: 回款返利分配表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配表 视图数据对象", description = "回款返利分配表 视图数据对象") +public class ScmCollectionRebateDistributionVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("预提申请") + private String withholdingApply; // 预提申请 + @ApiModelProperty("回款金额") + private String collectionMoney; // 回款金额 + @ApiModelProperty("预提返利") + private String estimateRebate; // 预提返利 + @ApiModelProperty("分摊参考比例") + private String shareGinExaProportion; // 分摊参考比例 + @ApiModelProperty("分摊比例") + private String shareProportion; // 分摊比例 + @ApiModelProperty("分摊返利总额") + private String shareRebateTotal; // 分摊返利总额 + @ApiModelProperty("本次返利余额") + private String thisRebateBalance; // 本次返利余额 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("使用组织名称") + private String useOrgName; // 使用组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("分配状态") + private String distributionState; // 分配状态 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java new file mode 100644 index 0000000000..d38a89b1f6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + +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-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVeh.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表", description = "回款返利分配车辆表") +@TableName("scm_collection_rebate_distribution_veh") +public class ScmCollectionRebateDistributionVeh extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java new file mode 100644 index 0000000000..61c4b7d428 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo
+ * Description: 回款返利分配车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 视图数据详情", description = "回款返利分配车辆表 视图数据详情") +public class ScmCollectionRebateDistributionVehDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java new file mode 100644 index 0000000000..8975779ecc --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto
+ * Description: 回款返利分配车辆表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 数据传输对象", description = "回款返利分配车辆表 数据传输对象") +public class ScmCollectionRebateDistributionVehDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java new file mode 100644 index 0000000000..91d69c79c0 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + +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 org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利分配车辆表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionRebateDistributionVeh", + name = "anrui-scm", + path = "v1/scmcollectionrebatedistributionveh", + fallback = ScmCollectionRebateDistributionVehFeignFallback.class) +public interface ScmCollectionRebateDistributionVehFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionRebateDistributionVehDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java new file mode 100644 index 0000000000..465c0530ed --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeignFallback
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionRebateDistributionVehFeignFallback implements ScmCollectionRebateDistributionVehFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionRebateDistributionVehDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java new file mode 100644 index 0000000000..e203fa6f39 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery
+ * Description: 回款返利分配车辆表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 查询条件", description = "回款返利分配车辆表 查询条件") +public class ScmCollectionRebateDistributionVehQuery implements Query { + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java new file mode 100644 index 0000000000..d3bb4bc5f5 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo
+ * Description: 回款返利分配车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利分配车辆表 视图数据对象", description = "回款返利分配车辆表 视图数据对象") +public class ScmCollectionRebateDistributionVehVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String carModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String carModelName; // 车型名称 + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("入库日期") + private String priceDate; // 入库日期 + @ApiModelProperty("销售日期") + private String salesDate; // 销售日期 + @ApiModelProperty("回款返利分配sid") + private String mainSid; // 回款返利分配sid + @ApiModelProperty("分配的回款返利") + private String distributionCollectionRebate; // 分配的回款返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java new file mode 100644 index 0000000000..8ba65927b7 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + +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-scm(回款返利车辆)
+ * File: ScmCollectionRebateVeh.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVeh
+ * Description: 回款返利车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利车辆表", description = "回款返利车辆表") +@TableName("scm_collection_rebate_veh") +public class ScmCollectionRebateVeh extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("回款返利sid") + private String mainSid; // 回款返利sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java new file mode 100644 index 0000000000..9233b4bb4d --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo
+ * Description: 回款返利车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利车辆表 视图数据详情", description = "回款返利车辆表 视图数据详情") +public class ScmCollectionRebateVehDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String mainSid; // 回款返利sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java new file mode 100644 index 0000000000..44d2c2f424 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehDto.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto
+ * Description: 回款返利车辆表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利车辆表 数据传输对象", description = "回款返利车辆表 数据传输对象") +public class ScmCollectionRebateVehDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String mainSid; // 回款返利sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeign.java new file mode 100644 index 0000000000..801fa7ca1c --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeign.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + +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 org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehFeign.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign
+ * Description: 回款返利车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利车辆表") +@FeignClient( + contextId = "anrui-scm-ScmCollectionRebateVeh", + name = "anrui-scm", + path = "v1/scmcollectionrebateveh", + fallback = ScmCollectionRebateVehFeignFallback.class) +public interface ScmCollectionRebateVehFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody ScmCollectionRebateVehDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据车架号查询车辆是否返利过") + @GetMapping("/fetchByVehSid/{vinNo}") + @ResponseBody + ScmCollectionRebateVehDetailsVo fetchByVehSid(@PathVariable("vinNo") String vinNo); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeignFallback.java new file mode 100644 index 0000000000..92c9bf5691 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeignFallback.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehFeignFallback.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeignFallback
+ * Description: 回款返利车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class ScmCollectionRebateVehFeignFallback implements ScmCollectionRebateVehFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebateveh/listPage无法访问"); + } + + @Override + public ResultBean save(ScmCollectionRebateVehDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebateveh/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebateveh/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmcollectionrebateveh/fetchDetailsBySid无法访问"); + } + + @Override + public ScmCollectionRebateVehDetailsVo fetchByVehSid(String vinNo) { + return null; + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java new file mode 100644 index 0000000000..40e99e12db --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehQuery.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehQuery
+ * Description: 回款返利车辆表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利车辆表 查询条件", description = "回款返利车辆表 查询条件") +public class ScmCollectionRebateVehQuery implements Query { + + @ApiModelProperty("回款返利sid") + private String mainSid; // 回款返利sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java new file mode 100644 index 0000000000..e79ffa8e13 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmcollectionrebateveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehVo.java
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo
+ * Description: 回款返利车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "回款返利车辆表 视图数据对象", description = "回款返利车辆表 视图数据对象") +public class ScmCollectionRebateVehVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("回款返利sid") + private String mainSid; // 回款返利sid + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String costPrice; // 厂家结算价 + @ApiModelProperty("预计返利") + private String estimateRebate; // 预计返利 + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java index 9786dd1a50..ca86d2e986 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java @@ -61,6 +61,8 @@ public class ScmCollectionRebateWithApplyVo implements Vo { private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 + @ApiModelProperty("回款金额") + private String withRebateTotal; // 回款金额 @ApiModelProperty("回款申请标题") private String collectionApply; // 回款申请标题 @ApiModelProperty("创建人姓名") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java index f47b567c7b..947dc0052c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java @@ -77,9 +77,7 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody ScmCollectionRebateDto dto) { - ResultBean rb = ResultBean.fireFail(); - scmCollectionRebateService.saveOrUpdateDto(dto); - return rb.success(); + return scmCollectionRebateService.saveOrUpdateDto(dto); } @Override @@ -109,9 +107,7 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { - ResultBean rb = ResultBean.fireFail(); - ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); + return scmCollectionRebateService.fetchAllDetailsVoBySid(sid); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java index c0c5ccef14..73a426f318 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java @@ -29,6 +29,9 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; +import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -42,6 +45,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -62,6 +66,10 @@ import java.util.List; */ @Service public class ScmCollectionRebateService extends MybatisBaseService { + + @Autowired + private ScmCollectionRebateVehService scmCollectionRebateVehService; + private QueryWrapper createQueryWrapper(ScmCollectionRebateQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -92,23 +100,41 @@ public class ScmCollectionRebateService extends MybatisBaseService scmCollectionRebateVehs = dto.getScmCollectionRebateVehs(); + if (StringUtils.isBlank(dtoSid)) { + String s = this.insertByDto(dto); + if (!scmCollectionRebateVehs.isEmpty()){ + for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) { + scmCollectionRebateVeh.setMainSid(s); + scmCollectionRebateVehService.insertByDto(scmCollectionRebateVeh); + } + } + return rb.success().setMsg("添加成功"); } ScmCollectionRebate scmCollectionRebate = fetchBySid(dtoSid); if (scmCollectionRebate == null){ - return; + return rb.setMsg("该回款返利不存在"); } this.updateByDto(dto); + scmCollectionRebateVehService.delByMainSid(dtoSid); + if (!scmCollectionRebateVehs.isEmpty()){ + for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) { + scmCollectionRebateVeh.setMainSid(dtoSid); + scmCollectionRebateVehService.updateByDto(scmCollectionRebateVeh); + } + } + return rb.success().setMsg("修改成功"); } - public void insertByDto(ScmCollectionRebateDto dto){ + public String insertByDto(ScmCollectionRebateDto dto){ ScmCollectionRebate entity = new ScmCollectionRebate(); BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setState(0); baseMapper.insert(entity); + return entity.getSid(); } public void updateByDto(ScmCollectionRebateDto dto){ @@ -139,6 +165,7 @@ public class ScmCollectionRebateService extends MybatisBaseService withApplyGetCollectionRebate(PagerQuery pq) { ScmCollectionRebateQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + qw.eq("brandSid",query.getBrandSid()); if (StringUtils.isNotBlank(query.getCollectionTypeKey())) { qw.eq("collectionTypeKey", query.getCollectionTypeKey()); } @@ -230,4 +257,12 @@ public class ScmCollectionRebateService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean fetchAllDetailsVoBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = fetchDetailsVoBySid(sid); + List scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid); + scmCollectionRebateDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos); + return rb.success().setData(scmCollectionRebateDetailsVo); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java index c2cc361592..52316cebb8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java @@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCh import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; import java.util.List; +import java.util.Map; /** * Project: anrui-scm(回款返利)
@@ -58,4 +59,6 @@ public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); List selectListVo(); + + int updateFlowFiled(Map beanToMap); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml index 15794482d1..15592b5b49 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml @@ -35,4 +35,19 @@ SELECT * FROM scm_collectionrebate_checkapply + + + UPDATE scm_collectionrebate_checkapply + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java index 9b2d8228d7..9210857fc4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java @@ -25,6 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,7 +43,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo; @@ -96,4 +103,47 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean submitCollectionRebateCheckApply(SubmitScmCollectionRebateCheckApplyDto dto) { + return scmCollectionrebateCheckapplyService.submitCollectionRebateCheckApply(dto); + } + + @Override + public ResultBean complete(ScmCollectionRebateCheckApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.getProDefId()); + return scmCollectionrebateCheckapplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmCollectionrebateCheckapplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmCollectionrebateCheckapplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmCollectionrebateCheckapplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmCollectionrebateCheckapplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmCollectionrebateCheckapplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmCollectionrebateCheckapplyService.getPreviousNodesForReject(query); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java index 05c3b6b3e1..6d6035d4a1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java @@ -26,10 +26,24 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +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.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -46,7 +60,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCh import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * Project: anrui-scm(回款返利)
@@ -66,6 +81,14 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -188,4 +211,221 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, scmCollectionrebateCheckapply); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + ResultBean resultBean = saveOrUpdateDto(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值 + Map variables = BeanUtil.beanToMap(dto); + //若有网关，则赋值网关中判断的字段。 + variables.put("businessSid", businessSid); + //=====================添加app所需参数 + Map appMap = new HashMap<>(); + appMap.put("sid",businessSid); + variables.put("app",appMap); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getCreateBySid()); + bv.setFormVariables(variables); + //流程定义id + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.getProDefId()); + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(scmCollectionrebateCheckapply.getTaskId()); + bv.setTaskDefKey(scmCollectionrebateCheckapply.getNodeSid()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitBusinessData(SubmitScmCollectionRebateCheckApplyDto dto, ScmCollectionrebateCheckapply scmCollectionRebateCheckApply) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (scmCollectionRebateCheckApply != null) { + String businessTaskId = scmCollectionRebateCheckApply.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + + } + return r; + } + + private int updateFlowFiled(Map beanToMap) { + return baseMapper.updateFlowFiled(beanToMap); + } + + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(bv.getBusinessSid()); + if (bv.getTaskId().equals(scmCollectionrebateCheckapply.getTaskId())) { + ResultBean resultBean = flowableFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { + } + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + + public ResultBean revokeProcess(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + //根据业务sid查询排内购申请 + ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(query.getBusinessSid()); + String businessTaskId = scmCollectionrebateCheckapply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + flowTaskVo.setValues(BeanUtil.beanToMap(scmCollectionrebateCheckapply)); + ResultBean 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 taskReject(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(query.getBusinessSid()); + if (scmCollectionrebateCheckapply == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = scmCollectionrebateCheckapply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean breakProcess(FlowTaskVo query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(query.getBusinessSid()); + String businessTaskId = scmCollectionrebateCheckapply.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(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 flowRecord(String procInsId) { + return flowTaskFeign.businessFlowRecord(procInsId); + } + + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATECHECKAPPLY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java new file mode 100644 index 0000000000..5af4dc2686 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistribution; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionMapper
+ * Description: 回款返利分配表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateDistributionMapper extends BaseMapper { + + //@Update("update scm_collection_rebate_distribution set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_collection_rebate_distribution") + List selectListVo(); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml new file mode 100644 index 0000000000..a5ba8f7664 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java new file mode 100644 index 0000000000..051a188875 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistribution; + +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.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDto; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeign; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionRest
+ * Description: 回款返利分配表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利分配表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionRest") +@RequestMapping("v1/scmcollectionrebatedistribution") +public class ScmCollectionRebateDistributionRest implements ScmCollectionRebateDistributionFeign { + + @Autowired + private ScmCollectionRebateDistributionService scmCollectionRebateDistributionService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateDistributionService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionRebateDistributionDto dto){ + return scmCollectionRebateDistributionService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateDistributionService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return scmCollectionRebateDistributionService.fetchAllDetailsVoBySid(sid); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java new file mode 100644 index 0000000000..a2b828b8f5 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java @@ -0,0 +1,160 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistribution; + +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.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; +import com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService; +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.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDto; +import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeign; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionService
+ * Description: 回款返利分配表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateDistributionService extends MybatisBaseService { + + @Autowired + private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService; + + private QueryWrapper createQueryWrapper(ScmCollectionRebateDistributionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateDistributionQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getBrandSid())){ + qw.eq("brandSid",query.getBrandSid()); + } + String createStartTime = query.getCreateStartTime(); + String createEndTime = query.getCreateEndTime(); + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + ); + String withholdingStartApply = query.getWithholdingStartApply(); + String withholdingEndApply = query.getWithholdingEndApply(); + qw.apply(StringUtils.isNotBlank(withholdingStartApply), "date_format (withholdingApply,'%Y年%m月份') >= date_format('" + withholdingStartApply + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(withholdingEndApply), "date_format (withholdingApply,'%Y年%m月份') <= date_format('" + withholdingEndApply + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(ScmCollectionRebateDistributionDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List scmCollectionRebateDistributionVehs = dto.getScmCollectionRebateDistributionVehs(); + if (StringUtils.isBlank(dtoSid)) { + String s = this.insertByDto(dto); + if (!scmCollectionRebateDistributionVehs.isEmpty()){ + for (ScmCollectionRebateDistributionVehDto scmCollectionRebateDistributionVeh : scmCollectionRebateDistributionVehs) { + scmCollectionRebateDistributionVeh.setMainSid(s); + scmCollectionRebateDistributionVehService.insertByDto(scmCollectionRebateDistributionVeh); + } + } + return rb.success().setMsg("添加成功"); + } + ScmCollectionRebateDistribution scmCollectionRebateDistribution = fetchBySid(dtoSid); + if (scmCollectionRebateDistribution == null){ + return rb.setMsg("该分配信息不存在"); + } + this.updateByDto(dto); + scmCollectionRebateDistributionVehService.delByMainSid(dtoSid); + if (!scmCollectionRebateDistributionVehs.isEmpty()){ + for (ScmCollectionRebateDistributionVehDto scmCollectionRebateDistributionVeh : scmCollectionRebateDistributionVehs) { + scmCollectionRebateDistributionVeh.setMainSid(dtoSid); + scmCollectionRebateDistributionVehService.updateByDto(scmCollectionRebateDistributionVeh); + } + } + return rb.success().setMsg("修改成功"); + } + + public String insertByDto(ScmCollectionRebateDistributionDto dto){ + ScmCollectionRebateDistribution entity = new ScmCollectionRebateDistribution(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return entity.getSid(); + } + + public void updateByDto(ScmCollectionRebateDistributionDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionRebateDistribution entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateDistributionDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionRebateDistribution entity = fetchBySid(sid); + ScmCollectionRebateDistributionDetailsVo vo = new ScmCollectionRebateDistributionDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean fetchAllDetailsVoBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateDistributionDetailsVo scmCollectionRebateDistributionDetailsVo = fetchDetailsVoBySid(sid); + List scmCollectionRebateDistributionVehDetailsVos = scmCollectionRebateDistributionVehService.fetchByMainSid(sid); + scmCollectionRebateDistributionDetailsVo.setScmCollectionRebateDistributionVehs(scmCollectionRebateDistributionVehDetailsVos); + return rb.success().setData(scmCollectionRebateDistributionDetailsVo); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java new file mode 100644 index 0000000000..bd64b1a1a8 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehMapper
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateDistributionVehMapper extends BaseMapper { + + //@Update("update scm_collection_rebate_distribution_veh set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_collection_rebate_distribution_veh") + List selectListVo(); + + @Delete("delete from scm_collection_rebate_distribution_veh where mainSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from scm_collection_rebate_distribution_veh where mainSid = #{sid}") + List fetchByMainSid(String sid); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml new file mode 100644 index 0000000000..aed8edf2da --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java new file mode 100644 index 0000000000..9cab87f162 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh; + +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.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehRest
+ * Description: 回款返利分配车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利分配车辆表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehRest") +@RequestMapping("v1/scmcollectionrebatedistributionveh") +public class ScmCollectionRebateDistributionVehRest implements ScmCollectionRebateDistributionVehFeign { + + @Autowired + private ScmCollectionRebateDistributionVehService scmCollectionRebateDistributionVehService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateDistributionVehService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionRebateDistributionVehDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateDistributionVehService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateDistributionVehService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateDistributionVehDetailsVo vo = scmCollectionRebateDistributionVehService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java new file mode 100644 index 0000000000..05d11f71d0 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehService.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh; + +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.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto; +import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利分配)
+ * File: ScmCollectionRebateDistributionVehService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService
+ * Description: 回款返利分配车辆表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-21 15:14:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateDistributionVehService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionRebateDistributionVehQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateDistributionVehQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionRebateDistributionVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionRebateDistributionVehDto dto){ + ScmCollectionRebateDistributionVeh entity = new ScmCollectionRebateDistributionVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionRebateDistributionVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionRebateDistributionVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateDistributionVehDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionRebateDistributionVeh entity = fetchBySid(sid); + ScmCollectionRebateDistributionVehDetailsVo vo = new ScmCollectionRebateDistributionVehDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.java new file mode 100644 index 0000000000..56445223c5 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebateveh; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVeh; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehMapper.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehMapper
+ * Description: 回款返利车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface ScmCollectionRebateVehMapper extends BaseMapper { + + //@Update("update scm_collection_rebate_veh set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from scm_collection_rebate_veh") + List selectListVo(); + + @Delete("delete from scm_collection_rebate_veh where mainSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from scm_collection_rebate_veh where mainSid = #{sid}") + List fetchByMainSid(String sid); + + @Select("select * from scm_collection_rebate_veh where vinNo = #{vinNo}") + ScmCollectionRebateVehDetailsVo fetchByVehSid(String vinNo); +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.xml new file mode 100644 index 0000000000..7b89b06a2b --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehRest.java new file mode 100644 index 0000000000..26df5d5299 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehRest.java @@ -0,0 +1,105 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebateveh; + +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.scm.api.scmcollectionrebateveh.ScmCollectionRebateVeh; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehQuery; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehFeignFallback.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehRest
+ * Description: 回款返利车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "回款返利车辆表") +@RestController("com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehRest") +@RequestMapping("v1/scmcollectionrebateveh") +public class ScmCollectionRebateVehRest implements ScmCollectionRebateVehFeign { + + @Autowired + private ScmCollectionRebateVehService scmCollectionRebateVehService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmCollectionRebateVehService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmCollectionRebateVehDto dto){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateVehService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + scmCollectionRebateVehService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + ScmCollectionRebateVehDetailsVo vo = scmCollectionRebateVehService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ScmCollectionRebateVehDetailsVo fetchByVehSid(String vinNo) { + return scmCollectionRebateVehService.fetchByVehSid(vinNo); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehService.java new file mode 100644 index 0000000000..6caf8ac88b --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebateveh/ScmCollectionRebateVehService.java @@ -0,0 +1,122 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.biz.scmcollectionrebateveh; + +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.scm.api.scmcollectionrebateveh.ScmCollectionRebateVeh; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehQuery; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto; +import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-scm(回款返利车辆)
+ * File: ScmCollectionRebateVehService.java
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService
+ * Description: 回款返利车辆表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-19 16:23:19
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class ScmCollectionRebateVehService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(ScmCollectionRebateVehQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmCollectionRebateVehQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(ScmCollectionRebateVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmCollectionRebateVehDto dto){ + ScmCollectionRebateVeh entity = new ScmCollectionRebateVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmCollectionRebateVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + ScmCollectionRebateVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmCollectionRebateVehDetailsVo fetchDetailsVoBySid(String sid){ + ScmCollectionRebateVeh entity = fetchBySid(sid); + ScmCollectionRebateVehDetailsVo vo = new ScmCollectionRebateVehDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public ScmCollectionRebateVehDetailsVo fetchByVehSid(String vinNo) { + return baseMapper.fetchByVehSid(vinNo); + } +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml index 4f4a48533e..edf70cc390 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml @@ -17,9 +17,6 @@ ${ew.sqlSegment} - - ${ew.sqlSegment} -