Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
45f8437fee
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/ExiCarQuery.java
  2. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 23
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  4. 5
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue
  5. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
  6. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue
  7. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue
  8. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue
  9. 22
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue
  10. 5
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
  11. 19
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue
  12. 6
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  13. 21
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue
  14. 5
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
  15. 20
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue
  16. 4
      anrui-crm/anrui-crm-api/pom.xml
  17. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java
  18. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java
  19. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
  20. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  21. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue
  22. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue
  23. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojia.vue
  24. 10
      anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingguanli.vue
  25. 4
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangguanli.vue
  26. 4
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/relation/guachechexingselect.vue
  27. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi.vue
  28. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/paichandingjin/paichandingjinconfirmed.vue
  29. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/paichandingjin/paichandingjintobeconfirmed.vue
  30. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  31. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue
  32. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  33. 1
      anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue
  34. 12
      anrui-terminal/anrui-terminal-api/pom.xml
  35. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
  36. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java
  37. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java
  38. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java
  39. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java
  40. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java
  41. 55
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractsPageVo.java
  42. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractsQuery.java
  43. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/PrintConfirmVo.java
  44. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java
  45. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java
  46. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java
  47. 62
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseInternalPurchasesVehicle.java
  48. 48
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/FlowTasksVo.java
  49. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
  50. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
  51. 16
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppCarVinsListVo.java
  52. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppDeliveredDetailssQuery.java
  53. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo.java
  54. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java
  55. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java
  56. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java
  57. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java
  58. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  59. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java
  60. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java
  61. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java
  62. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java
  63. 36
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillDetailsVo.java
  64. 46
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummaryDetailssVo.java
  65. 17
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummarysQuery.java
  66. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummarysVo.java
  67. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java
  68. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java
  69. 23
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java
  70. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoVo.java
  71. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeignFallback.java
  72. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDetailVo.java
  73. 1
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDto.java
  74. 28
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigNowCarsQuery.java
  75. 38
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigNowCarsVo.java
  76. 41
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigOrderCarsVo.java
  77. 34
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseNowProduceCarVo.java
  78. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeign.java
  79. 14
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeignFallback.java
  80. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVinNowCarVo.java
  81. 111
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppModelConfigListVo.java
  82. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageVo.java
  83. 30
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/BaseModelVehicleVersionVo.java
  84. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ConfigInfo.java
  85. 69
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelConfigListsQuery.java
  86. 67
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelConfigsVo.java
  87. 24
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/MoreConfigVo.java
  88. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java
  89. 22
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java
  90. 9
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java
  91. 23
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java
  92. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java
  93. 13
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java
  94. 16
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java
  95. 37
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java
  96. 18
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockRest.java
  97. 37
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockService.java
  98. 1
      doc/databases/risk_center.sql

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/ExiCarQuery.java

@ -72,4 +72,6 @@ public class ExiCarQuery implements Query {
@ApiModelProperty(value = "锁定状态")
private String lockedState;
private String orgPath;
}

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

@ -1028,10 +1028,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private QueryWrapper<BaseVehicleListVo> exiCarBuildQueryWrapper(ExiCarQuery params) {
QueryWrapper<BaseVehicleListVo> qw = new QueryWrapper<>();
//本分公司
if (StringUtils.isNotBlank(params.getUserSid())) {
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
if(StringUtils.isNotBlank(params.getOrgPath())){
String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
qw.eq("bv.createOrgSid", orgSid);
}else{
if (StringUtils.isNotBlank(params.getUserSid())) {
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("bv.createOrgSid", orgSid);
}
}
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
}

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

@ -162,6 +162,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@ -3977,11 +3978,29 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
appMap.put("saleOrderSid", busSalesOrder.getSid());
variables.put("app", appMap);
//是否是全款
if (BusSalesOrderConstantUtils.PayTypeEnum.FULL_PAYMENT.getCode().equals(busSalesOrder.getPayTypeKey())) {//全款
if (BusSalesOrderConstantUtils.PayTypeEnum.FULL_PAYMENT.getCode().equals(busSalesOrder.getPayTypeKey())) {
//全款
if (BusSalesOrderConstantUtils.FinancePlanenum.PURCHASETYPEUP_ONE.getCode().equals(busSalesOrder.getFinancePlan())) {
//自由资金
variables.put(BusSalesOrderConstantUtils.IS_LOAN, true);
} else {
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
//三方金融
//查询是外部金融还是自用非担保,如果是外部金融的话,厂家贴息为0时,不走金融审批
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid());
if(solutionsDetailsVoResultBean.getData() != null){
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if("02".equals(solutionsDetailsVo.getTypeKey())){
if(new BigDecimal(BigInteger.ZERO).compareTo(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())) == 0){
variables.put(BusSalesOrderConstantUtils.IS_LOAN, true);
}else{
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
}
}else{
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
}
}else{
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
}
}
} else {
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);

5
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue

@ -137,7 +137,7 @@
</template>
<script>
import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
import { fetchBySid, getOrgSidByPath } from '@/api/dictcommons/dictcommons'
import { saveChe, selectSid, submitVehicleApprove } from '@/api/jichuxinxi/busdeposit'
import xuanzecheliang from './relation/xuanzecheliang'
import xuanzekehu from './relation/xuanzekehu'
@ -202,8 +202,7 @@ export default {
},
methods: {
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.getCreateOrgName(res.data)
}

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue

@ -225,7 +225,7 @@
<script>
import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
import { fetchBySid, getPathSidByUserSid, selAccountByOrgSid, fetchDetailsByUseOrgSid } from '@/api/dictcommons/dictcommons'
import { selAccountByOrgSid, fetchDetailsByUseOrgSid } from '@/api/dictcommons/dictcommons'
import Upload from '@/components/uploadFile/upload.vue' //
import xuanzekehu from './relation/xuanzekehu'

7
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue

@ -95,7 +95,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getList } from '@/api/jichuxinxi/busdepositvehicle'
import { brandDown, typeValues, getPathSidByUserSid, fetchByUseOrgSid} from '@/api/dictcommons/dictcommons'
import { brandDown, typeValues, getOrgSidByPath, fetchByUseOrgSid} from '@/api/dictcommons/dictcommons'
export default {
name: 'xuanzecheliang',
@ -131,6 +131,7 @@ export default {
vinNo: '',
location: '',
userSid: '',
orgPath: '',
vinNoList: []
}
},
@ -177,6 +178,7 @@ export default {
this.listQuery.params.location = ''
this.listQuery.params.carColorKey = ''
this.listQuery.params.userSid = ''
this.listQuery.params.orgPath = ''
this.getList()
},
//
@ -197,7 +199,7 @@ export default {
this.carColor_list = resp.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
@ -239,6 +241,7 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
getList(this.listQuery).then((response) => {
this.listLoading = false

7
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue

@ -95,7 +95,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getList } from '@/api/jichuxinxi/busdepositvehicle'
import { brandDown, typeValues, getPathSidByUserSid, fetchByUseOrgSid} from '@/api/dictcommons/dictcommons'
import { brandDown, typeValues, getOrgSidByPath, fetchByUseOrgSid } from '@/api/dictcommons/dictcommons'
export default {
name: 'xuanzecheliang',
@ -131,6 +131,7 @@ export default {
vinNo: '',
location: '',
userSid: '',
orgPath: '',
vinNoList: []
}
},
@ -177,6 +178,7 @@ export default {
this.listQuery.params.location = ''
this.listQuery.params.carColorKey = ''
this.listQuery.params.userSid = ''
this.listQuery.params.orgPath = ''
this.getList()
},
//
@ -197,7 +199,7 @@ export default {
this.carColor_list = resp.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
@ -239,6 +241,7 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
getList(this.listQuery).then((response) => {
this.listLoading = false

7
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue

@ -139,8 +139,8 @@
</template>
<script>
import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons'
import { saveChe, selectSid, submitVehicleApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
import { fetchBySid, getOrgSidByPath } from '@/api/dictcommons/dictcommons'
import { saveChe, selectSid, submitVehicleApprove } from '@/api/jichuxinxi/busdeposit'
import xuanzecheliang from '@/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang'
import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu'
@ -188,8 +188,7 @@ export default {
},
methods: {
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.getCreateOrgName(res.data)
}

22
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanguanli.vue

@ -46,7 +46,7 @@
</el-table-column>
<el-table-column label="状态" align="left" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-if="scope.row.nodeState == '待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
@ -131,7 +131,8 @@
</template>
<script>
import { deleteBySids, listPage, typeValues } from '@/api/jichuxinxi/busdeposit'
import { deleteBySids, listPage } from '@/api/jichuxinxi/busdeposit'
import { typeValues, selectHaveMessage } from '@/api/dictcommons/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './xunidingdanAdd.vue'
@ -208,7 +209,8 @@ export default {
name: '',
billType: '',
startTime: '',
endTime: ''
endTime: '',
orgPath: ''
}
},
hetongdanganguanliInfoShow: false
@ -257,7 +259,7 @@ export default {
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
init() {
typeValues({type: 'depositBillType' }).then((res) => {
typeValues({ type: 'depositBillType' }).then((res) => {
if (res.code === '200') {
this.depositType = res.data
console.log('下拉框请求订单类型', res.data)
@ -303,6 +305,7 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
listPage(this.listQuery).then((response) => {
this.listLoading = false
@ -350,7 +353,8 @@ export default {
name: '',
billType: '',
startTime: '',
endTime: ''
endTime: '',
orgPath: ''
}
}
this.getList()
@ -377,8 +381,12 @@ export default {
},
//
toAdd() {
this.billTypeKey = ''
this.dialogVisible = true
selectHaveMessage({ menuUrl: this.$route.path, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.billTypeKey = ''
this.dialogVisible = true
}
})
},
//
handleConfirm() {

5
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue

@ -227,7 +227,7 @@
<script>
import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
import { fetchBySid, getPathSidByUserSid, selAccountByOrgSid, fetchDetailsByUseOrgSid } from '@/api/dictcommons/dictcommons'
import { fetchBySid, getOrgSidByPath, selAccountByOrgSid, fetchDetailsByUseOrgSid } from '@/api/dictcommons/dictcommons'
import Upload from '@/components/uploadFile/upload.vue' //
import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu'
@ -351,8 +351,7 @@ export default {
this.temp.collectionBank = bb.depositBank
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.temp.orgSid = res.data
fetchBySid(res.data).then((res) => {

19
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue

@ -121,7 +121,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/anruifinmanagement/payment'
import { typeValues, getPathSidByUserSid, selectByOrgSid } from '@/api/jichuxinxi/dictcommons'
import {typeValues, getOrgSidByPath, selectByOrgSid, selectHaveMessage } from '@/api/jichuxinxi/dictcommons'
import paymentAdd from './paymentAdd'
import paymentInfo from './paymentInfo'
import { getStorage } from '@/utils/auth'
@ -194,7 +194,8 @@ export default {
costTypeKey: '',
receiveCompany: '',
state: '',
userSid: ''
userSid: '',
orgPath: ''
},
current: 1,
size: 5,
@ -242,7 +243,7 @@ export default {
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((response) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
if (response.success) {
selectByOrgSid({ orgSid: response.data }).then((resp) => {
if (resp.success) {
@ -306,6 +307,7 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
@ -337,7 +339,8 @@ export default {
costTypeKey: '',
receiveCompany: '',
state: '',
userSid: ''
userSid: '',
orgPath: ''
},
current: 1,
size: 5,
@ -346,8 +349,12 @@ export default {
this.getList()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
selectHaveMessage({ menuUrl: this.$route.path, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.viewState = 2
this.$refs['divAdd'].showAdd()
}
})
},
//
doDel() {

6
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@ -208,7 +208,7 @@
import req from '@/api/anruifinmanagement/payment'
import {
typeValues,
getPathSidByUserSid,
getOrgSidByPath,
fetchBySid,
selectByOrgSid,
getListOrg,
@ -255,6 +255,7 @@ export default {
isVeh: '',
carBrandName: '',
carBrandSid: '',
orgPath: '',
detailsList: [],
vehicleList: []
},
@ -309,7 +310,7 @@ export default {
})
},
getPathSidByUserSid() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((response) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
if (response.success) {
selectByOrgSid({ orgSid: response.data }).then((resp) => {
if (resp.success) {
@ -339,6 +340,7 @@ export default {
})
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.name = window.sessionStorage.getItem('name')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.viewTitle = '【新增】付款申请'
},
showEdit(row) {

21
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue

@ -127,7 +127,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/anruifinmanagement/payment'
import { typeValues, brandDown, getPathSidByUserSid } from '@/api/jichuxinxi/dictcommons'
import { typeValues, brandDown, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'xianchechaxun',
@ -136,7 +136,6 @@ export default {
},
data() {
return {
useOrg: '',
carBrand_list: [],
vehicleType_list: [],
productLine_list: [],
@ -192,21 +191,19 @@ export default {
this.getList()
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.useOrg = res.data
// -
brandDown({ useOrg: res.data }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
}
})
},
shujuzidian() {
// -
brandDown({ useOrg: this.useOrg }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
typeValues({ type: 'vehicleFunction' }).then((res) => {
if (res.success) {
this.vehicleType_list = res.data

5
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@ -205,7 +205,7 @@
<script>
import req from '@/api/anruifinmanagement/payment'
import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
import { typeValues, getOrgSidByPath, fetchBySid, selectByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
import vehcile from './relation/vehcile'
export default {
name: 'fukuanEdit',
@ -246,6 +246,7 @@ export default {
isVeh: '',
carBrandName: '',
carBrandSid: '',
orgPath: '',
detailsList: [],
vehicleList: []
},
@ -304,7 +305,7 @@ export default {
})
},
getPathSidByUserSid() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((response) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
if (response.success) {
selectByOrgSid({ orgSid: response.data }).then((resp) => {
if (resp.success) {

20
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue

@ -127,7 +127,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/anruifinmanagement/payment'
import { typeValues, brandDown, getPathSidByUserSid } from '@/api/jichuxinxi/dictcommons'
import { typeValues, brandDown, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'xianchechaxun',
@ -136,7 +136,6 @@ export default {
},
data() {
return {
useOrg: '',
carBrand_list: [],
vehicleType_list: [],
productLine_list: [],
@ -192,21 +191,20 @@ export default {
this.getList()
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.useOrg = res.data
brandDown({ useOrg: res.data }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
}
})
},
shujuzidian() {
// -
brandDown({ useOrg: this.useOrg }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
typeValues({ type: 'vehicleFunction' }).then((res) => {
if (res.success) {
this.vehicleType_list = res.data

4
anrui-crm/anrui-crm-api/pom.xml

@ -34,12 +34,12 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<!-- <dependency>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-base-api</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
</dependency>-->
</dependencies>

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java

@ -88,6 +88,8 @@ public class SolutionsDetailsVo implements Vo {
private String otherPolicyMonthlyRepay;
@ApiModelProperty("其它融利息总额")
private String otherPolicyInterest;
@ApiModelProperty("其它融年利率")
private String otherPolicyYearRatio;
@ApiModelProperty("'融资首付")
private BigDecimal loanDownPay;

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java

@ -85,6 +85,8 @@ public class SolutionsDto implements Dto {
private String otherPolicyMonthlyRepay;
@ApiModelProperty("其它融利息总额")
private String otherPolicyInterest;
@ApiModelProperty("其它融年利率")
private String otherPolicyYearRatio;
@ApiModelProperty("'融资首付")
private String loanDownPay;
@ -99,6 +101,7 @@ public class SolutionsDto implements Dto {
@ApiModelProperty("预计首期还款日")
private String returnTime;
//金融方案费用明细
@ApiModelProperty("融资首付")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java

@ -76,6 +76,8 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
private BigDecimal interest;
@ApiModelProperty("预计首期还款日")
private String returnTime;
@ApiModelProperty("其它融年利率")
private String otherPolicyYearRatio;
}

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@ -191,7 +191,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
downPayAmount = downPayAmount.add(new BigDecimal(dto.getDownPayAmount()));
//首付款比例
String downPayRatio = "";
BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal).multiply(new BigDecimal("100"));
BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal).multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP);
downPayRatio = downPayRatio1.toString() + "%";
//产品贷款金额 = 融资项目总额-首付金额
loanAmount = loanTotal.subtract(downPayAmount);
@ -213,7 +213,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BigDecimal bondAmount = new BigDecimal(dto.getBondAmount());
//贷款保证金比例
String bondRatio = "";
BigDecimal bondRatio1 = bondAmount.divide(loanAmount).multiply(new BigDecimal("100"));
BigDecimal bondRatio1 = bondAmount.divide(loanAmount).multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP);
bondRatio = bondRatio1.toString() + "%";
loanSolutions.setBondAmount(bondAmount);
loanSolutions.setBondRatio(bondRatio);
@ -222,7 +222,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
String factoryDiscount = dto.getFactoryDiscount();
if (StringUtils.isNotBlank(factoryDiscount)) {
loanSolutions.setFactoryDiscount(new BigDecimal(factoryDiscount));
}else{
} else {
loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
}
//年利率
@ -295,6 +295,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
//利息总额
loanSolutionsOtherpolicy.setInterest(interest);
loanSolutions.setOtherPolicyState(1);
loanSolutionsOtherpolicy.setOtherPolicyYearRatio(dto.getOtherPolicyYearRatio());
} else {
//方案汇总
//融资首付 = 首付金额-其它融贷款金额
@ -438,6 +439,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
//查询金融方案
loanSolutions = new LoanSolutions();
BeanUtil.copyProperties(dto, loanSolutions);
if (StringUtils.isBlank(dto.getFactoryDiscount())) {
loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
}
baseMapper.insert(loanSolutions);
}
return rb.success();

4
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue

@ -86,7 +86,7 @@
<script>
import { pagerList } from '@/api/cheliang/chexingbaojia'
import { brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
@ -168,7 +168,7 @@ export default {
}
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
//

4
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue

@ -367,7 +367,7 @@
<script>
import { details, offerSubmit, save } from '@/api/cheliang/chexingbaojia'
import { typeValues, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { typeValues, getOrgSidByPath } from '@/api/cheliang/dictcommons'
export default {
name: 'xiaoshouzhichibaojia',
@ -407,7 +407,7 @@ export default {
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
this.formobj.useOrgSid = resp.data

4
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/yibaojiaguanli/yibaojia.vue

@ -104,7 +104,7 @@ import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import yibaojiaInfo from './yibaojiaInfo'
import vehicleconfiguration from './vehicleconfiguration'
import { brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
export default {
name: 'yibaojia',
@ -175,7 +175,7 @@ export default {
}
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
//

10
anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingguanli.vue

@ -82,7 +82,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import guachechexingAdd from './guachechexingAdd'
import guachechexingInfo from './guachechexingInfo'
import { getGysTypeByOrgSid, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
import { getGysTypeByOrgSid, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'guachechexingguanli',
@ -160,7 +160,7 @@ export default {
this.trailerType_list = res.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.queryParams.params.useOrgSid = res.data
getGysTypeByOrgSid({ orgSid: res.data, supplierType: '0002' }).then((resp) => {
@ -242,11 +242,11 @@ export default {
},
toEdit() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑'})
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
return
}
if (this.multipleSelection.length > 1) {
this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑'})
this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
return
}
this.viewState = 3
@ -258,7 +258,7 @@ export default {
},
doDel() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'})
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'

4
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangguanli.vue

@ -89,7 +89,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import guachetaizhangAdd from './guachetaizhangAdd'
import guachetaizhangInfo from './guachetaizhangInfo'
import { getGysTypeByOrgSid, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { getGysTypeByOrgSid, getOrgSidByPath } from '@/api/cheliang/dictcommons'
export default {
name: 'GuaCheTaiZhangGuanLi',
@ -163,7 +163,7 @@ export default {
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.queryParams.params.useOrgSid = res.data
getGysTypeByOrgSid({ orgSid: res.data, supplierType: '0002' }).then((res) => {

4
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/relation/guachechexingselect.vue

@ -75,7 +75,7 @@ import req from '@/api/guache/guachechexing'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getGysTypeByOrgSid, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
import { getGysTypeByOrgSid, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'guachechexingselect',
@ -126,7 +126,7 @@ export default {
this.trailerType_list = res.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.queryParams.params.useOrgSid = res.data
getGysTypeByOrgSid({ orgSid: res.data, supplierType: '0002' }).then((resp) => {

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi.vue

@ -95,7 +95,7 @@ import req from '@/api/shangzhuang/shangzhuang'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getPathSidByUserSid,typeValues } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'ShangZhuangGuanLi',

4
anrui-scm/anrui-scm-ui/src/views/supplychain/paichandingjin/paichandingjinconfirmed.vue

@ -66,7 +66,7 @@ import req from '@/api/supplychain/paichandingjin'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
export default {
name: 'paichandingjinyiqueren',
@ -132,7 +132,7 @@ export default {
}
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
//

4
anrui-scm/anrui-scm-ui/src/views/supplychain/paichandingjin/paichandingjintobeconfirmed.vue

@ -96,7 +96,7 @@
<script>
import req from '@/api/supplychain/paichandingjin'
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
@ -190,7 +190,7 @@ export default {
}
},
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
//

2
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -17,7 +17,7 @@
<el-col :span="12">
<div class="span-sty"><span><span class="icon">*</span>车架号:</span></div>
<el-form-item prop="vin">
<el-input v-model="temp.vin" placeholder="请输入车架号" class="addinputw" :readonly="temp.purchaseKey !== '002'"/>
<el-input v-model.trim="temp.vin" placeholder="请输入车架号" class="addinputw" :readonly="temp.purchaseKey !== '002'"/>
</el-form-item>
</el-col>
<el-col :span="12">

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue

@ -95,7 +95,7 @@ import req from '@/api/shangzhuang/shangzhuang'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getPathSidByUserSid,typeValues } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'ShangZhuangGuanLi',

4
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -220,7 +220,7 @@
<script>
import req from '@/api/ruzhang/scmapplyinbound'
import upload_picture from '@/components/uploadFile/upload_picture'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
export default {
name: 'ruzhangEdit',
components: {
@ -314,7 +314,7 @@ export default {
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.useOrgSid).then((res) => {

1
anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtiaojiaEdit.vue

@ -121,7 +121,6 @@
<script>
import req from '@/api/othermenu/shangzhuangtiaojia'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
import shangzhuangtaizhangchoose from './shangzhuangtaizhangchoose'
export default {

12
anrui-terminal/anrui-terminal-api/pom.xml

@ -29,30 +29,30 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<!-- <dependency>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-buscenter-api</artifactId>
<version>0.0.1</version>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-base-api</artifactId>
<version>0.0.1</version>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yxt.anrui.fin</groupId>
<artifactId>anrui-fin-api</artifactId>
<version>0.0.1</version>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yxt.anrui</groupId>
<artifactId>anrui-crm-api</artifactId>
<version>0.0.1</version>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependency>-->
</dependencies>

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AdCarListVo;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeign.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.advanceInvoice;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
@ -34,7 +33,6 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
@ -60,7 +58,7 @@ import javax.validation.Valid;
contextId = "anrui-terminal-BusAdvanceGinvoiceapply",
name = "anrui-terminal",
path = "autoservice/v1/advanceInvoice",
fallback = BusAdvanceGinvoiceapplyFeignFallback.class)
fallback = AppBusAdvanceGinvoiceapplyFeignFallback.class)
public interface AppBusAdvanceGinvoiceapplyFeign {

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@ -1,13 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceInfoVo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoiceVinDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
@ -22,7 +14,6 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: bus(bus) <br/>

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.AdvanceArrearsTakeCarQuery;
import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.flowable.CompleteArrearsTakeCarDto;
@ -10,8 +9,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: bus(bus) <br/>
* File: BusArrearsCarryVehicleApplyFeignFallback.java <br/>

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java

@ -1,8 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeignFallback;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -33,14 +30,14 @@ import javax.validation.Valid;
contextId = "anrui-terminal-CommonContract",
name = "anrui-terminal",
path = "/autoservice/v1/contract",
fallback = CommonContractFeignFallback.class)
fallback = AppCommonContractFeignFallback.class)
public interface AppCommonContractFeign {
@ApiOperation("移动端-合同审核列表")
@PostMapping("/getContractList")
@ResponseBody
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractsQuery> pagerQuery);
/* @ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo/{contractSid}/{userSid}")

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java

@ -1,7 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -25,7 +23,7 @@ import org.springframework.stereotype.Component;
public class AppCommonContractFeignFallback implements AppCommonContractFeign {
@Override
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(PagerQuery<AppCommonContractsQuery> pagerQuery) {
return null;
}

55
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractsPageVo.java

@ -0,0 +1,55 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:26
* @Description
*/
@Data
public class AppCommonContractsPageVo {
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("合同类型")
private String contractType;
@ApiModelProperty("乙方名称")
private String partyB;
@ApiModelProperty("经办人")
private String handler;
@ApiModelProperty("车型")
private String model;
@ApiModelProperty("合同金额")
private String contractPrice;
@ApiModelProperty("是否显示办理按钮")
@JsonProperty("isShowUpdate")
private boolean isShowUpdate;
@ApiModelProperty("节点状态")
private String nodeState;
private List<PrintConfirmVo> files = new ArrayList<>();
@ApiModelProperty("是否显示下载")
private Boolean isShowDownload;
@JsonIgnore
private String commonContractUrl;
@JsonProperty("number")
private String num;
}

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractsQuery.java

@ -0,0 +1,26 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:26
* @Description
*/
@Data
public class AppCommonContractsQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("状态")
private String type;
@ApiModelProperty("客户")
private String names;
@ApiModelProperty("分公司sid")
private String useOrgSid;
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/PrintConfirmVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:18
* @Description
*/
@Data
public class PrintConfirmVo {
@ApiModelProperty("文件名称")
private String name;
@ApiModelProperty("下载路径")
private String downloadUrl;
}

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java

@ -1,8 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppScmVehicleGressionFeignFallback;
import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -46,22 +44,22 @@ public interface AppDiscountpackageFegin {
@ApiOperation(value = "办理(同意)")
@PutMapping("/agreeDiscountPackageApplyInfo")
@ResponseBody
public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplyCompleteDto dto);
public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplysCompleteDto dto);
@ApiOperation(value = "撤回流程")
@PutMapping(value = "/recallDiscountPackageApplyInfo")
@ResponseBody
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTasksVo flowTaskVo);
@ApiOperation(value = "驳回任务")
@PutMapping(value = "/rejectDiscountPackageApplyInfo")
@ResponseBody
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTasksVo flowTaskVo);
@ApiOperation(value = "终止任务")
@PutMapping(value = "/stopDiscountPackageApplyInfo")
@ResponseBody
public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
public ResultBean breakProcess(@RequestBody FlowTasksVo flowTaskVo);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -28,22 +27,22 @@ public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{
}
@Override
public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
return null;
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
return null;
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
public ResultBean taskReject(FlowTasksVo flowTaskVo) {
return null;
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
return null;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplyCompleteDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -15,7 +14,7 @@ import java.util.Map;
* @Description
*/
@Data
public class BaseDiscountpackageApplyCompleteDto implements Dto {
public class BaseDiscountpackageApplysCompleteDto implements Dto {
private static final long serialVersionUID = 3240453987322803352L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
@ -41,5 +40,5 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto {
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
@ApiModelProperty("调账车辆列表")
private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
}

62
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseInternalPurchasesVehicle.java

@ -0,0 +1,62 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:36
* @Description
*/
@Data
public class BaseInternalPurchasesVehicle {
@ApiModelProperty("内购申请sid")
private String mainSid; // 内购申请sid
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型别名")
private String vehicleAlias; // 车型别名
@ApiModelProperty("常用配置sid")
private String configSid; // 常用配置sid
@ApiModelProperty("常用配置名称")
private String configName; // 常用配置名称
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("库存地点sid")
private String inventoryLocationSid; // 库存地点sid
@ApiModelProperty("库存地点名称")
private String inventoryLocationName; // 库存地点名称
@ApiModelProperty("内销价格")
private String witPinMoney; // 内销价格
@ApiModelProperty("初始内销价格")
private String initialWitPinMoney; // 初始内销价格
@ApiModelProperty("发票类型key")
private String invoiceTypeKey; // 发票类型key
@ApiModelProperty("发票类型value")
private String invoiceTypeValue; // 发票类型value
@ApiModelProperty("运费承担方sid")
private String freightUndertakerSid; // 运费承担方sid
@ApiModelProperty("运费承担方名称")
private String freightUndertakerName; // 运费承担方名称
@ApiModelProperty("是否调账(0未调账,1已调账)")
private String isAccadj; // 是否调账(0未调账,1已调账)
@ApiModelProperty("是否开票(0未开票,1已开票)")
private String isInvoicing; // 是否开票(0未开票,1已开票)
@ApiModelProperty("销售指导价")
private BigDecimal guidedPrice; // 销售指导价
@ApiModelProperty("调回状态key")
private String recallStateKey; // 调回状态key
@ApiModelProperty("调回状态value")
private String recallStateValue; // 调回状态value
@ApiModelProperty("厂家结算价")
private BigDecimal costPrice; // 厂家结算价
@ApiModelProperty("调入方采购部门sid")
private String callInBuyerOrgSid; // 调入方采购部门sid
@ApiModelProperty("调入方采购部门名称")
private String callInBuyerOrgName; // 调入方采购部门名称
}

48
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/FlowTasksVo.java

@ -0,0 +1,48 @@
package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:34
* @Description
*/
@Data
public class FlowTasksVo {
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("businessSid ")
private String businessSid;
@ApiModelProperty("用户Id")
private String userId;
@ApiModelProperty("用户Sid")
private String userSid;
@ApiModelProperty("任务意见")
private String comment;
@ApiModelProperty("流程实例Id")
private String instanceId;
@ApiModelProperty("节点")
private String targetKey;
@ApiModelProperty("流程变量信息")
private Map<String, Object> values = new HashMap<>();
@ApiModelProperty("审批人")
private String assignee;
@ApiModelProperty("候选人")
private List<String> candidateUsers = new ArrayList<>();
@ApiModelProperty("审批组")
private List<String> candidateGroups = new ArrayList<>();
}

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@ -25,12 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.AdvanceInvoiceTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.CompleteAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.flowable.SubmitAdvanceInvoiceDto;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery;
@ -76,7 +70,7 @@ public interface AppBusDeliveredApplyFeign {
@ApiOperation("移动端-初始化 出库申请 待出库进入")
@PostMapping("/getRetrievalApplyInfo")
@ResponseBody
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(@RequestBody AppDeliveredDetailsQuery query);
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(@RequestBody AppDeliveredDetailssQuery query);
@ApiOperation("手机端-获取 出库申请列表")
@PostMapping("/getRetrievalApplyList")
@ -115,7 +109,7 @@ public interface AppBusDeliveredApplyFeign {
@ApiOperation("初始化 出库申请 车架号")
@GetMapping("/getRetrievalCarVin")
@ResponseBody
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(@RequestParam("sid") String sid);
/* @ApiOperation("删除 出库申请记录")
@DeleteMapping("/deleteRetrievalInfo/{sid}")

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@ -25,8 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsQuery;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.CompleteRetrievalDto;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalQuery;
import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.RetrievalTaskQuery;
@ -61,7 +59,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
}
@Override
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
return null;
}
@ -86,7 +84,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
}
@Override
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
return null;
}

16
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppCarVinsListVo.java

@ -0,0 +1,16 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:44
* @Description
*/
@Data
public class AppCarVinsListVo {
@ApiModelProperty("车架号")
private String vin;
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppDeliveredDetailssQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:47
* @Description
*/
@Data
public class AppDeliveredDetailssQuery implements Query {
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("车架号")
private List<String> list;
@ApiModelProperty("用户sid")
private String userSid;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDto.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyInfoVo.java

@ -2,7 +2,6 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailsVo.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
@ -77,7 +76,7 @@ import java.util.List;
contextId = "anrui-terminal-BusSalesOrder",
name = "anrui-terminal",
path = "/autoservice/v1/saleOrders",
fallback = BusSalesOrderFeignFallback.class)
fallback = AppBusSalesOrderFeignFallback.class)
public interface AppBusSalesOrderFeign {
/*-------------------------------------App销售订单接口------------------------------------------------*/

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailsInitVo.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDto.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleCarListDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

36
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillDetailsVo.java

@ -0,0 +1,36 @@
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 12:01
* @Description
*/
@Data
public class AppCustomerBillDetailsVo {
@ApiModelProperty("实收金额")
private String money;
@ApiModelProperty("款项类型")
private String paymentType;
@ApiModelProperty("创建人")
private String handle;
@ApiModelProperty("创建人Sid")
private String staffSid;
@ApiModelProperty("创建时间")
private String date;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户类型")
private String customerKey;
@ApiModelProperty("客户头像")
private String customerImage;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("应收项目名称")
private String receivablesName;
}

46
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummaryDetailssVo.java

@ -0,0 +1,46 @@
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:55
* @Description
*/
@Data
public class AppCustomerBillSummaryDetailssVo {
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户类型")
private String customerKey;
@ApiModelProperty("客户头像")
private String customerImage;
@ApiModelProperty("合同日期")
private String date;
@ApiModelProperty("未收费用")
private String unReceivable;
@ApiModelProperty("应收费用")
private String receivable;
@ApiModelProperty("实缴费用")
private String paid;
@ApiModelProperty("应收项目名称")
private String receivablesName;
}

17
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummarysQuery.java

@ -0,0 +1,17 @@
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 12:00
* @Description
*/
@Data
public class AppCustomerBillSummarysQuery implements Query {
@ApiModelProperty("合同sid")
private String contractSid;
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppCustomerBillSummarysVo.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 12:00
* @Description
*/
@Data
public class AppCustomerBillSummarysVo {
@ApiModelProperty("应收")
private String receivable;
@ApiModelProperty("未收")
private String unReceivable;
@ApiModelProperty("时间")
private String date;
@ApiModelProperty("实收")
private String paid;
@ApiModelProperty("付款sid")
private String paymentSid;
@ApiModelProperty("状态")
private String state;
@ApiModelProperty("款项类型")
private String payType;
@ApiModelProperty("应收项目名称")
private String receivablesName;
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@ -25,8 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -87,14 +85,14 @@ public interface AppFinCollectionConfirmationFeign {
@ApiOperation("app获取客户账单列表")
@PostMapping("/getCustomerBillList")
public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(@RequestBody PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq);
public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(@RequestBody PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq);
@ApiOperation("app获取客户合同账单列表")
@PostMapping("/getCustomerBill2List")
public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(@RequestBody PagerQuery<AppCustomerBillSummaryQuery> pq);
public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(@RequestBody PagerQuery<AppCustomerBillSummarysQuery> pq);
@ApiOperation("app获取账单详情")
@PostMapping("/getCustomerBillDetail/{paymentSid}")
public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(@PathVariable("paymentSid") String paymentSid);
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@ -25,8 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -85,17 +83,17 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
}
@Override
public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummarysQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
return null;
}
}

23
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinUncollectedReceivablesDetailedsQuery.java

@ -0,0 +1,23 @@
package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 11:56
* @Description
*/
@Data
public class AppFinUncollectedReceivablesDetailedsQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("分公司sid")
private String useOrgSid;
}

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/baseInfo/AppScmBaseInfoVo.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.supplychain.baseInfo;
import com.itextpdf.text.pdf.PRAcroForm;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeignFallback.java

@ -25,15 +25,7 @@
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
import com.yxt.anrui.base.api.basemodelmodprice.*;
import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
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;
/**

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDetailVo.java

@ -2,7 +2,6 @@ package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

1
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDto.java

@ -27,7 +27,6 @@ package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

28
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigNowCarsQuery.java

@ -0,0 +1,28 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 13:52
* @Description
*/
@Data
public class AppBaseConfigNowCarsQuery {
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("分公司sid")
private String useOrg;
@ApiModelProperty("只考虑车架号")
private String names;
}

38
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigNowCarsVo.java

@ -0,0 +1,38 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/3/29 13:51
* @Description
*/
@Data
public class AppBaseConfigNowCarsVo {
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("销售指导价")
private String price;
@ApiModelProperty("现车列表")
private List<AppBaseVinNowCarVo> records;
@ApiModelProperty("常用配置")
private String commonlyConfig;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private String labelValue;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
private BaseModelVehicleVersionVo carDetailPage;
}

41
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseConfigOrderCarsVo.java

@ -0,0 +1,41 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/3/29 13:52
* @Description
*/
@Data
public class AppBaseConfigOrderCarsVo {
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("销售指导价")
private String price;
@ApiModelProperty("排产列表")
private List<AppBaseNowProduceCarVo> records;
@ApiModelProperty("常用配置")
private String commonlyConfig;
@ApiModelProperty("页数")
private Long pages;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private String labelValue;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
private BaseModelVehicleVersionVo carDetailPage;
}

34
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseNowProduceCarVo.java

@ -0,0 +1,34 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:39
* @Description
*/
@Data
public class AppBaseNowProduceCarVo {
@ApiModelProperty("订单编号")
private String orderId;
@ApiModelProperty("状态")
private String state;
@ApiModelProperty("订单日期")
private String date;
@ApiModelProperty("预计上线日期")
private String forecastDate;
@ApiModelProperty("上线日期")
private String upDate;
@ApiModelProperty("下线日期")
private String downDate;
@ApiModelProperty("采购数量")
private String number;
}

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeign.java

@ -25,9 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -56,15 +53,15 @@ public interface AppBaseVehicleStockFeign {
@ApiOperation("App库存车型获取当前车型配置(标签)")
@PostMapping("/getStockModelConfigList")
@ResponseBody
public ResultBean<ModelConfigVo> getStockModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListQuery> pagerQuery);
public ResultBean<ModelConfigsVo> getStockModelConfigList(@Valid @RequestBody PagerQuery<ModelConfigListsQuery> pagerQuery);
@ApiOperation("手机端-库存配置列表获取现车列表")
@PostMapping("/getStockModelNowCarList")
@ResponseBody
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(@RequestBody AppBaseConfigNowCarsQuery pagerQuery);
@ApiOperation("手机端-库存配置列表获取排产列表")
@PostMapping("/getStockModelOrderCarList")
@ResponseBody
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(@RequestBody AppBaseConfigNowCarsQuery pagerQuery);
}

14
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVehicleStockFeignFallback.java

@ -25,14 +25,6 @@
*********************************************************/
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -61,17 +53,17 @@ public class AppBaseVehicleStockFeignFallback implements AppBaseVehicleStockFeig
}
@Override
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
public ResultBean<ModelConfigsVo> getStockModelConfigList(PagerQuery<ModelConfigListsQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(AppBaseConfigNowCarsQuery pagerQuery) {
return null;
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(AppBaseConfigNowCarsQuery pagerQuery) {
return null;
}
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppBaseVinNowCarVo.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:01
* @Description
*/
@Data
public class AppBaseVinNowCarVo {
@ApiModelProperty("车辆sid")
private String sid;
@ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("状态")
private String state;
@ApiModelProperty("颜色")
private String color;
@ApiModelProperty("合格证")
private String certificate;
@ApiModelProperty("存放地点")
private String address;
@ApiModelProperty("促销价")
private String promotionPrice;
@ApiModelProperty(value = "销售政策标签")
private String label;
}

111
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppModelConfigListVo.java

@ -0,0 +1,111 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:43
* @Description
*/
@Data
public class AppModelConfigListVo {
@ApiModelProperty("以元为单位的指导价")
private String prices;
@ApiModelProperty(value = "配置sid")
private String configSid;
@ApiModelProperty("车型配置")
private String modelConfigName;
@ApiModelProperty(value = "常用配置名称")
private String configName;
@ApiModelProperty(value = "颜色")
private String carColor;
@ApiModelProperty(value = "现车")
private String nowCarNum;
@ApiModelProperty(value = "排产车")
private String produceCarNum;
@ApiModelProperty(value = "指导价")
private String price;
@ApiModelProperty(value = "更多配置")
private List<MoreConfigVo> moreList = new ArrayList<>();
//常用配置名称拼接字段
@ApiModelProperty(value = "缓冲器:后端内部使用")
private String slowMachine;
@ApiModelProperty(value = "后视镜:后端内部使用")
private String rearViewMirror;
@ApiModelProperty(value = "轮胎:后端内部使用")
private String tireSize;
@ApiModelProperty(value = "驾驶室:后端内部使用")
private String specification;
@ApiModelProperty(value = "速比:后端内部使用")
private String rearAxleRatio;
@ApiModelProperty(value = "后桥:后端内部使用")
private String rearAxleValue;
@ApiModelProperty(value = "空调:后端内部使用")
private String airConditioner;
@ApiModelProperty(value = "轮毂材质:后端内部使用")
private String hubMaterial;
@ApiModelProperty(value = "导流罩:后端内部使用")
private String baffleModel;
@ApiModelProperty(value = "悬架:后端内部使用")
private String suspension;
@ApiModelProperty(value = "座椅:后端内部使用")
private String seat;
@ApiModelProperty(value = "护轮罩:后端内部使用")
private String tireCover;
@ApiModelProperty(value = "鞍座:后端内部使用")
private String saddle;
@ApiModelProperty(value = "轴距:后端内部使用")
private String wheelbase;
@ApiModelProperty(value = "保险杠:后端内部使用")
private String bumper;
@ApiModelProperty(value = "配置包:后端内部使用")
private String configuringBao;
@ApiModelProperty(value = "独立热源:后端内部使用")
private String independentSources;
@ApiModelProperty(value = "燃料箱:后端内部使用")
private String fuelTank;
@ApiModelProperty(value = "多媒体:后端内部使用")
private String multimedia;
@ApiModelProperty(value = "有效期:移动")
private String priceValidity;
@ApiModelProperty(value = "厂家结算价")
private String manufactorSettlementPrice;
// @ApiModelProperty(value = "指导价")
// private String guidedPrice;
@ApiModelProperty(value = "辆(已废弃)")
private String vehicleQuantity;
@ApiModelProperty(value = "车型sid:内部")
private String modelSid;
@ApiModelProperty(value = "车型名称:移动")
private String modelName;
@ApiModelProperty(value = "车型名称:移动")
private String model;
@ApiModelProperty(value = "品牌名称:移动")
private String brand;
@ApiModelProperty(value = "更多配置:移动")
private String otherConfig;
@ApiModelProperty(value = "品牌sid:移动")
private String brandSid;
@ApiModelProperty(value = "车型配置关联sid")
private String vehModelConfigSid;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
@ApiModelProperty(value = "销售政策标签")
private String label;
private BaseModelVehicleVersionVo carDetailPage;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/AppStockPageVo.java

@ -1,7 +1,5 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.VehicleGressionVehVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

30
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/BaseModelVehicleVersionVo.java

@ -0,0 +1,30 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:01
* @Description
*/
@Data
public class BaseModelVehicleVersionVo {
@ApiModelProperty("版本编码")
private Integer moduleVersion;
@ApiModelProperty("apk下载地址")
private String path;
@ApiModelProperty("0.内置Activity 1.内置WebView 2.RePlugin插件")
private String type;
@ApiModelProperty("插件名称")
private String modulePluginName;
@ApiModelProperty("地址")
private String moduleAction;
private String json;
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ConfigInfo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:43
* @Description
*/
@Data
public class ConfigInfo {
@ApiModelProperty(value = "配置名称")
private String configName;
@ApiModelProperty(value = "配置值")
private String configValue;
}

69
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelConfigListsQuery.java

@ -0,0 +1,69 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 13:51
* @Description
*/
@Data
public class ModelConfigListsQuery implements Query {
@ApiModelProperty("颜色")
private String bodyColor;
@ApiModelProperty("缓速器")
private String slowMachine;
@ApiModelProperty("后视镜")
private String rearViewMirror;
@ApiModelProperty("轮胎")
private String tireSize;
@ApiModelProperty("驾驶室")
private String specification;
@ApiModelProperty("速比")
private String rearAxleRatio;
@ApiModelProperty("后桥")
private String rearAxleValue;
@ApiModelProperty("空调")
private String airConditioner;
@ApiModelProperty("轮毂材质")
private String hubMaterial;
@ApiModelProperty("导流罩")
private String diversionCover;
@ApiModelProperty("悬架")
private String suspension;
@ApiModelProperty("座椅")
private String seat;
@ApiModelProperty("护轮罩")
private String protectTireCover;
@ApiModelProperty("轴距")
private String wheelbase;
@ApiModelProperty("鞍座")
private String saddle;
@ApiModelProperty("配置包")
private String configuringBao;
@ApiModelProperty("保险杠")
private String bumper;
@ApiModelProperty("燃料箱")
private String fuelTank;
@ApiModelProperty("独立热源")
private String independentSources;
@ApiModelProperty("多媒体")
private String multiMedia;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("分公司:后端内部使用")
private String useOrg;
@ApiModelProperty("分公司:机构sid")
private String orgPath;
@ApiModelProperty(value = "标签")
private String label;
}

67
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/ModelConfigsVo.java

@ -0,0 +1,67 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/3/29 13:49
* @Description
*/
@Data
public class ModelConfigsVo {
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("配置列表")
private List<AppModelConfigListVo> modelConfigList;
@ApiModelProperty(value = "页数")
private Integer pages;
@ApiModelProperty("车型图片:移动端使用")
private List<String> modelImage;
@ApiModelProperty("车型list:移动端使用")
private List<ConfigInfo> configList;
@ApiModelProperty("指导价:移动端使用")
private String price;
@ApiModelProperty("品牌名称:移动端使用")
private String brandName;
@ApiModelProperty("版本:移动端使用")
private String vehicleVersionValue;
@ApiModelProperty(value = "功能:移动端使用")
private String vehicleTypeValue;
@ApiModelProperty(value = "系列:移动端使用")
private String productLineValue;
@ApiModelProperty(value = "驱动:移动端使用")
private String driveFormValue;
@ApiModelProperty(value = "马力:移动端使用")
private String powerValue;
@ApiModelProperty(value = "燃料:移动端使用")
private String fuelTypeValue;
@ApiModelProperty(value = "变速箱:移动端使用")
private String gearboxTypeValue;
@ApiModelProperty(value = "细分市场:移动端使用")
private String marketSegments;
@ApiModelProperty(value = "系别:移动端使用")
private String department;
@ApiModelProperty(value = "发动机型号:移动端使用")
private String engineTypeValue;
@ApiModelProperty(value = "公告型号:移动端使用")
private String announcementModel;
@ApiModelProperty(value = "规格型号:移动端使用")
private String specifications;
@ApiModelProperty(value = "货箱:移动端使用")
private String packingCase;
@ApiModelProperty(value = "内部编码:移动端使用")
private String insideCode;
@ApiModelProperty(value = "排放标准:移动端使用")
private String emissionStandardValue;
@ApiModelProperty(value = "车型标签")
private String labelName;
@ApiModelProperty(value = "车型标签(页面展示)")
private String labelValue;
}

24
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/stock/MoreConfigVo.java

@ -0,0 +1,24 @@
package com.yxt.anrui.terminal.api.supplychain.stock;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2023/3/29 14:05
* @Description
*/
@Data
public class MoreConfigVo {
@ApiModelProperty(value = "公司名称")
private String companyName;
@ApiModelProperty(value = "现车数量")
private String nowCarNum;
@ApiModelProperty(value = "排产数量")
private String produceCarNum;
@ApiModelProperty(value = "分公司sid:车型及配置关联中的后端内部使用")
private String useOrgSid;
}

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java

@ -1,11 +1,7 @@
package com.yxt.anrui.terminal.biz.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractFeign;
import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.anrui.terminal.api.autoservice.contract.*;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -41,7 +37,7 @@ public class AppCommonContractRest implements AppCommonContractFeign {
@Override
@ApiOperation("移动端-合同审核列表")
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(PagerQuery<AppCommonContractsQuery> pagerQuery) {
return appCommonContractService.getContractList(pagerQuery);
}

22
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

@ -2,15 +2,19 @@ package com.yxt.anrui.terminal.biz.autoservice.contract;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.api.commoncontract.flowable.*;
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.terminal.api.autoservice.contract.AppCommonContractsPageVo;
import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractsQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -19,8 +23,11 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
@ -53,9 +60,18 @@ public class AppCommonContractService {
* @param pagerQuery
* @return
*/
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
ResultBean resultBean = commonContractFeign.getContractList(pagerQuery);
return resultBean;
public ResultBean<PagerVo<AppCommonContractsPageVo>> getContractList(PagerQuery<AppCommonContractsQuery> pagerQuery) {
/* ResultBean resultBean = commonContractFeign.getContractList(pagerQuery);
return resultBean;*/
ResultBean<PagerVo<AppCommonContractsPageVo>> rb = ResultBean.fireFail();
PagerQuery<AppCommonContractQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppCommonContractPageVo>> resultBean = commonContractFeign.getContractList(pq);
List<AppCommonContractsPageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCommonContractsPageVo.class)).collect(Collectors.toList());
PagerVo<AppCommonContractsPageVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setData(v);
}

9
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -39,22 +38,22 @@ public class AppDiscountPackageApplyRest implements AppDiscountpackageFegin {
}
@Override
public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
return appDiscountPackageApplyService.complete(dto);
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
return appDiscountPackageApplyService.revokeProcess(flowTaskVo);
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
public ResultBean taskReject(FlowTasksVo flowTaskVo) {
return appDiscountPackageApplyService.taskReject(flowTaskVo);
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
return appDiscountPackageApplyService.breakProcess(flowTaskVo);
}

23
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java

@ -2,6 +2,7 @@ package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign;
import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.flow.FlowTaskVo;
@ -57,29 +58,35 @@ public class AppDiscountPackageApplyService {
return rb.success();
}
public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
ResultBean rb = ResultBean.fireFail();
com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto();
BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new BaseDiscountpackageApplyCompleteDto();
BeanUtil.copyProperties(dto,baseDiscountpackageApplyCompleteDto);
baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
return rb.success();
}
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo);
FlowTaskVo flowTaskVo1 = new FlowTaskVo();
BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo1);
return rb.success();
}
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
public ResultBean taskReject(FlowTasksVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
baseDiscountpackageApplyFeign.taskReject(flowTaskVo);
FlowTaskVo flowTaskVo1 = new FlowTaskVo();
BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
baseDiscountpackageApplyFeign.taskReject(flowTaskVo1);
return rb.success();
}
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
ResultBean rb = ResultBean.fireFail();
baseDiscountpackageApplyFeign.breakProcess(flowTaskVo);
FlowTaskVo flowTaskVo1 = new FlowTaskVo();
BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
baseDiscountpackageApplyFeign.breakProcess(flowTaskVo1);
return rb.success();
}

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@ -70,7 +70,7 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
}
@Override
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
return appBusDeliveredApplyService.getRetrievalApplyInfo(query);
}
@ -95,7 +95,7 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
}
@Override
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
return appBusDeliveredApplyService.getRetrievalCarVin(sid);
}

13
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@ -26,6 +26,7 @@
package com.yxt.anrui.terminal.biz.autoservice.retrieval;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.busdelivered.*;
import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
@ -47,8 +48,11 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
@ -90,7 +94,7 @@ public class AppBusDeliveredApplyService {
return rb.success().setData(vo);
}
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailssQuery query) {
ResultBean<DeliveredDetailsVo> rb = ResultBean.fireFail();
AppDeliveredDetailsQuery appDeliveredDetailsQuery = new AppDeliveredDetailsQuery();
BeanUtils.copyProperties(query, appDeliveredDetailsQuery);
@ -129,11 +133,12 @@ public class AppBusDeliveredApplyService {
return resultBean;
}
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
ResultBean<List<AppCarVinListVo>> rb = ResultBean.fireFail();
public ResultBean<List<AppCarVinsListVo>> getRetrievalCarVin(String sid) {
ResultBean<List<AppCarVinsListVo>> rb = ResultBean.fireFail();
ResultBean<List<AppCarVinListVo>> retrievalCarVin = busDeliveredApplyDetailsFeign.getRetrievalCarVin(sid);
List<AppCarVinListVo> data = retrievalCarVin.getData();
return rb.success().setData(data);
List<AppCarVinsListVo> voList = Optional.ofNullable(data).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCarVinsListVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean<DeliveredApplyDetailsVo> getRetrievalDetail(String sid) {

16
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@ -25,15 +25,18 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillDetailVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryQuery;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppCustomerBillSummaryVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedQuery;
import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* Project: anrui-fin(销售相关) <br/>
@ -93,7 +96,6 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
/**
* 手机端款项确认申请详情
*
* @param collectionBillSid
* @return
*/
@Override
@ -135,17 +137,17 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
}
@Override
public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq) {
return appfinCollectionConfirmationService.getCustomerBillList(pq);
}
@Override
public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummarysQuery> pq) {
return appfinCollectionConfirmationService.getCustomerBill2List(pq);
}
@Override
public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
return appfinCollectionConfirmationService.getCustomerBillDetail(paymentSid);
}
}

37
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@ -30,16 +30,11 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageQuery;
import com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo;
import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -185,8 +180,15 @@ public class AppFinCollectionConfirmationService {
* @param pq
* @return
*/
public ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pq) {
return finUncollectedReceivablesDetailedFeign.getCustomerBillList(pq);
public ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> getCustomerBillList(PagerQuery<AppFinUncollectedReceivablesDetailedsQuery> pq) {
ResultBean<PagerVo<AppCustomerBillSummaryDetailssVo>> rb = ResultBean.fireFail();
PagerQuery<AppFinUncollectedReceivablesDetailedQuery> pqq = CoverUtils.getPagerQuery(pq);
ResultBean<PagerVo<AppCustomerBillSummaryDetailsVo>> resultBean = finUncollectedReceivablesDetailedFeign.getCustomerBillList(pqq);
List<AppCustomerBillSummaryDetailssVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCustomerBillSummaryDetailssVo.class)).collect(Collectors.toList());
PagerVo<AppCustomerBillSummaryDetailssVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
}
/**
@ -195,8 +197,15 @@ public class AppFinCollectionConfirmationService {
* @param pq
* @return
*/
public ResultBean<PagerVo<AppCustomerBillSummaryVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummaryQuery> pq) {
return finUncollectedReceivablesDetailedFeign.getCustomerBill2List(pq);
public ResultBean<PagerVo<AppCustomerBillSummarysVo>> getCustomerBill2List(PagerQuery<AppCustomerBillSummarysQuery> pq) {
ResultBean<PagerVo<AppCustomerBillSummarysVo>> rb = ResultBean.fireFail();
PagerQuery<AppCustomerBillSummaryQuery> pqq = CoverUtils.getPagerQuery(pq);
ResultBean<PagerVo<AppCustomerBillSummaryVo>> resultBean = finUncollectedReceivablesDetailedFeign.getCustomerBill2List(pqq);
List<AppCustomerBillSummarysVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCustomerBillSummarysVo.class)).collect(Collectors.toList());
PagerVo<AppCustomerBillSummarysVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
}
/**
@ -205,7 +214,13 @@ public class AppFinCollectionConfirmationService {
* @param paymentSid
* @return
*/
public ResultBean<PagerVo<AppCustomerBillDetailVo>> getCustomerBillDetail(String paymentSid) {
return finUncollectedReceivablesDetailedFeign.getCustomerBillDetail(paymentSid);
public ResultBean<PagerVo<AppCustomerBillDetailsVo>> getCustomerBillDetail(String paymentSid) {
ResultBean<PagerVo<AppCustomerBillDetailsVo>> rb = ResultBean.fireFail();
ResultBean<PagerVo<AppCustomerBillDetailVo>> resultBean = finUncollectedReceivablesDetailedFeign.getCustomerBillDetail(paymentSid);
List<AppCustomerBillDetailsVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppCustomerBillDetailsVo.class)).collect(Collectors.toList());
PagerVo<AppCustomerBillDetailsVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
}
}

18
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockRest.java

@ -25,20 +25,10 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.supplychain.basevehiclestock;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarQuery;
import com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo;
import com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.*;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.CompleteGressionDto;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionTaskQuery;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.SubmitGressionDto;
import com.yxt.anrui.terminal.api.supplychain.stock.AppBaseVehicleStockFeign;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageQuery;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
import com.yxt.anrui.terminal.biz.supplychain.scmvehiclegression.AppScmVehicleGressionService;
import com.yxt.anrui.terminal.api.supplychain.stock.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -62,17 +52,17 @@ public class AppBaseVehicleStockRest implements AppBaseVehicleStockFeign {
}
@Override
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
public ResultBean<ModelConfigsVo> getStockModelConfigList(PagerQuery<ModelConfigListsQuery> pagerQuery) {
return appBaseVehicleStockService.getStockModelConfigList(pagerQuery);
}
@Override
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(AppBaseConfigNowCarsQuery pagerQuery) {
return appBaseVehicleStockService.getStockModelNowCarList(pagerQuery);
}
@Override
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(AppBaseConfigNowCarsQuery pagerQuery) {
return appBaseVehicleStockService.getStockModelOrderCarList(pagerQuery);
}
}

37
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/basevehiclestock/AppBaseVehicleStockService.java

@ -30,10 +30,7 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigListQuery;
import com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageQuery;
import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
import com.yxt.anrui.terminal.api.supplychain.stock.*;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -57,22 +54,32 @@ public class AppBaseVehicleStockService {
return rb.success().setData(vo);
}
public ResultBean<ModelConfigVo> getStockModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
ResultBean<ModelConfigVo> rb = ResultBean.fireFail();
public ResultBean<ModelConfigsVo> getStockModelConfigList(PagerQuery<ModelConfigListsQuery> pagerQuery) {
ResultBean<ModelConfigsVo> rb = ResultBean.fireFail();
ModelConfigsVo modelConfigsVo = new ModelConfigsVo();
PagerQuery<ModelConfigListQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<ModelConfigVo> modelConfigLableList = baseModelConfigFeign.getStockModelConfigList(pq);
return rb.success().setData(modelConfigLableList.getData());
BeanUtil.copyProperties(modelConfigLableList.getData(), modelConfigsVo);
return rb.success().setData(modelConfigsVo);
}
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigNowCarVo> rb = ResultBean.fireFail();
ResultBean<AppBaseConfigNowCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelNowCarList(pagerQuery);
return rb.success().setData(stockModelNowCarList.getData());
public ResultBean<AppBaseConfigNowCarsVo> getStockModelNowCarList(AppBaseConfigNowCarsQuery pagerQuery) {
ResultBean<AppBaseConfigNowCarsVo> rb = ResultBean.fireFail();
AppBaseConfigNowCarsVo appBaseConfigNowCarsVo = new AppBaseConfigNowCarsVo();
AppBaseConfigNowCarQuery appBaseConfigNowCarQuery = new AppBaseConfigNowCarQuery();
BeanUtil.copyProperties(pagerQuery, appBaseConfigNowCarQuery);
ResultBean<AppBaseConfigNowCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelNowCarList(appBaseConfigNowCarQuery);
BeanUtil.copyProperties(stockModelNowCarList.getData(), appBaseConfigNowCarsVo);
return rb.success().setData(appBaseConfigNowCarsVo);
}
public ResultBean<AppBaseConfigOrderCarVo> getStockModelOrderCarList(AppBaseConfigNowCarQuery pagerQuery) {
ResultBean<AppBaseConfigOrderCarVo> rb = ResultBean.fireFail();
ResultBean<AppBaseConfigOrderCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelOrderCarList(pagerQuery);
return rb.success().setData(stockModelNowCarList.getData());
public ResultBean<AppBaseConfigOrderCarsVo> getStockModelOrderCarList(AppBaseConfigNowCarsQuery pagerQuery) {
ResultBean<AppBaseConfigOrderCarsVo> rb = ResultBean.fireFail();
AppBaseConfigOrderCarsVo appBaseConfigOrderCarsVo = new AppBaseConfigOrderCarsVo();
AppBaseConfigNowCarQuery appBaseConfigNowCarQuery = new AppBaseConfigNowCarQuery();
BeanUtil.copyProperties(pagerQuery, appBaseConfigNowCarQuery);
ResultBean<AppBaseConfigOrderCarVo> stockModelNowCarList = baseVehicleFeign.getStockModelOrderCarList(appBaseConfigNowCarQuery);
BeanUtil.copyProperties(stockModelNowCarList.getData(), appBaseConfigOrderCarsVo);
return rb.success().setData(appBaseConfigOrderCarsVo);
}
}

1
doc/databases/risk_center.sql

@ -972,6 +972,7 @@ CREATE TABLE `loan_solutions_otherPolicy`
`monthlyRepay` decimal(10, 2) DEFAULT NULL COMMENT '月还金额',
`interest` decimal(10, 2) DEFAULT NULL COMMENT '利息总额',
`returnTime` varchar(64) DEFAULT NULL COMMENT '预计首期还款日',
`otherPolicyYearRatio` varchar(64) DEFAULT NULL COMMENT '年利率',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB

Loading…
Cancel
Save