Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
commit
75bd040919
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
  2. 21
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
  3. 4
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
  4. 4
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
  5. 21
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
  6. 4
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
  7. 10
      anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue
  8. 12
      anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingInfo.vue
  9. 12
      anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue
  10. 10
      anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue
  11. 10
      anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingYiBan.vue
  12. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java
  13. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml
  14. 18
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerCrmVehVo.java
  15. 86
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicle.java
  16. 91
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetailsVo.java
  17. 91
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDto.java
  18. 89
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleQuery.java
  19. 91
      yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java
  20. 69
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java
  21. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
  22. 102
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java
  23. 109
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@ -39,11 +39,13 @@ import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery;
import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@ -118,6 +120,8 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@Autowired
private BaseVehicleService baseVehicleService;
private QueryWrapper<BaseShuntingInvoicingApply> createQueryWrapper(BaseShuntingInvoicingApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -440,7 +444,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
}
//推送开票管理
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(baseShuntingInvoicinApplyeVehDetailsVo.getInvoicinCompanyName());
BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(baseShuntingInvoicinApplyeVehDetailsVo.getVinNo() , baseShuntingInvoicingApply.getCallOutOrgSid());
FinCompanyInvoicingDetailsVo companyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsBySystem(baseVehicle.getPurchaseSystemSid()).getData();
finVehicleInvoiceDto.setInvoiceTitle(companyInvoicingDetailsVo.getName());
finVehicleInvoiceDto.setContractNo("");
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData();

21
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue

@ -14,7 +14,7 @@
<div class="titwu">出库开票申请</div>
<el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">发起部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
</el-col>
@ -28,7 +28,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">销售部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
</el-col>
@ -46,7 +46,7 @@
<div class="span-sty">合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
</el-col>
@ -98,7 +98,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">车型</div>
<el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
</el-col>
@ -792,6 +792,19 @@ export default {
.addinputw {
margin-left: 110px !important;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 110px !important;
}

4
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@ -43,7 +43,7 @@
<div class="span-sty">合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
</el-col>
@ -333,7 +333,7 @@ export default {
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content {
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;

4
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue

@ -45,7 +45,7 @@
<div class="span-sty">合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
</el-col>
@ -581,7 +581,7 @@ export default {
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content {
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;

21
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue

@ -13,7 +13,7 @@
<div class="titwu">出库开票申请</div>
<el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">发起部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.pcApplyDept }}</span></el-form-item>
</el-col>
@ -27,7 +27,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">销售部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.staffDeptName }}</span></el-form-item>
</el-col>
@ -45,7 +45,7 @@
<div class="span-sty">合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
</el-col>
@ -97,7 +97,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">车型</div>
<el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
</el-col>
@ -734,6 +734,19 @@ export default {
.addinputw {
margin-left: 110px !important;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 110px !important;
}

4
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue

@ -43,7 +43,7 @@
<div class="span-sty">合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.contractId }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">客户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
</el-col>
@ -453,7 +453,7 @@ export default {
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content {
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;

10
anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue

@ -581,6 +581,16 @@ export default {
this.$message({ showClose: true, type: 'error', message: '证件号码不能为空' })
return
}
if (this.formobj.customerTypeKey === '1') {
if (this.formobj.isAnchored === '') {
this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司请选择是或否' })
return
}
if (this.formobj.isAnchored === '1' && (this.formobj.businessName === '' || this.formobj.taxpayerNo === '')) {
this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司选则是的情况下,请完善挂靠运输公司信息' })
return
}
}
this.getUrl()
this.submitdisabled = true
req.submit(this.formobj).then((res) => {

12
anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingInfo.vue

@ -83,7 +83,7 @@
<el-col :span="8">
<div v-show="formobj.customerTypeKey == '1'">
<div class="span-sty">是否挂靠运输公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.isAnchored = '1' ? '是' : '否' }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.isAnchored == 1 ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
</el-row>
@ -113,7 +113,7 @@
</el-table-column>
</el-table>
</div>
<div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">
<div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
<div class="title">挂靠运输公司信息</div>
<el-row>
<el-col :span="16">
@ -147,17 +147,17 @@
</el-row>
</div>
<div class="title">附件清单</div>
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '')">
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.license" :key="index" :src="item" :preview-src-list="formobj.license"/></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '')">
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '0')">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span v-show="formobj.customerTypeKey === '2'">法人和实际控制人身份证</span>
<span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">本人身份证</span>
<span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '0'">本人身份证</span>
</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.idCard" :key="index" :src="item" :preview-src-list="formobj.idCard"/></el-form-item>
</el-col>
@ -168,7 +168,7 @@
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.infoLetter" :key="index" :src="item" :preview-src-list="formobj.infoLetter"/></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">
<el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车队挂靠协议</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.agreement" :key="index" :src="item" :preview-src-list="formobj.agreement"/></el-form-item>

12
anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue

@ -86,7 +86,7 @@
<el-col :span="8">
<div v-show="formobj.customerTypeKey == '1'">
<div class="span-sty">是否挂靠运输公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.isAnchored = '1' ? '是' : '否' }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.isAnchored == 1 ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
</el-row>
@ -116,7 +116,7 @@
</el-table-column>
</el-table>
</div>
<div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">
<div v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
<div class="title">挂靠运输公司信息</div>
<el-row>
<el-col :span="16">
@ -150,17 +150,17 @@
</el-row>
</div>
<div class="title">附件清单</div>
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '')">
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.license" :key="index" :src="item" :preview-src-list="formobj.license"/></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '')">
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '0')">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span v-show="formobj.customerTypeKey === '2'">法人和实际控制人身份证</span>
<span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">本人身份证</span>
<span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '0'">本人身份证</span>
</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.idCard" :key="index" :src="item" :preview-src-list="formobj.idCard"/></el-form-item>
</el-col>
@ -171,7 +171,7 @@
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.infoLetter" :key="index" :src="item" :preview-src-list="formobj.infoLetter"/></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">
<el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车队挂靠协议</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.agreement" :key="index" :src="item" :preview-src-list="formobj.agreement"/></el-form-item>

10
anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue

@ -584,6 +584,16 @@ export default {
this.$message({ showClose: true, type: 'error', message: '证件号码不能为空' })
return
}
if (this.formobj.customerTypeKey === '1') {
if (this.formobj.isAnchored === '') {
this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司请选择是或否' })
return
}
if (this.formobj.isAnchored === '1' && (this.formobj.businessName === '' || this.formobj.taxpayerNo === '')) {
this.$message({ showClose: true, type: 'error', message: '是否挂靠运输公司选则是的情况下,请完善挂靠运输公司信息' })
return
}
}
this.getUrl()
this.submitdisabled = true
req.submit(this.formobj).then((res) => {

10
anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingYiBan.vue

@ -83,7 +83,7 @@
<el-col :span="8">
<div v-show="formobj.customerTypeKey == '1'">
<div class="span-sty">是否挂靠运输公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.isAnchored = '1' ? '是' : '否' }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.isAnchored == 1 ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
</el-row>
@ -147,17 +147,17 @@
</el-row>
</div>
<div class="title">附件清单</div>
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '')">
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.license" :key="index" :src="item" :preview-src-list="formobj.license"/></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '')">
<el-row v-if="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '0')">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span v-show="formobj.customerTypeKey === '2'">法人和实际控制人身份证</span>
<span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">本人身份证</span>
<span v-show="formobj.customerTypeKey === '1' && formobj.isAnchored === '0'">本人身份证</span>
</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.idCard" :key="index" :src="item" :preview-src-list="formobj.idCard"/></el-form-item>
</el-col>
@ -168,7 +168,7 @@
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.infoLetter" :key="index" :src="item" :preview-src-list="formobj.infoLetter"/></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === ''">
<el-row v-if="formobj.customerTypeKey === '1' && formobj.isAnchored === '1'">
<el-col :span="24">
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">车队挂靠协议</div>
<el-form-item><el-image class="addinputInfo-special" style="width: 150px; height: 150px" v-for="(item, index) in formobj.agreement" :key="index" :src="item" :preview-src-list="formobj.agreement"/></el-form-item>

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java

@ -67,6 +67,5 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper<ScmApplyInboun
@Select("select * from scm_apply_inbound_veh_query where mainSid = #{cgrkdSid}")
List<ScmApplyInboundVehQueryDetailsVo> fetchByMainSid(String cgrkdSid);
@Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE CONCAT('%',#{vinNo},'%')")
ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(@Param("vinNo") String vinNo);
}

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.xml

@ -10,4 +10,19 @@
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryVo">
SELECT * FROM scm_apply_inbound_veh_query <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchDetailsByVinNo"
resultType="com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo">
SELECT
a.*
FROM
scm_apply_inbound_veh_query AS a
LEFT JOIN scm_apply_inbound_query AS q ON a.mainSid = q.sid
LEFT JOIN scm_apply_inbound AS i ON q.busSid = i.sid
WHERE
vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
AND i.nodeState = '已办结'
ORDER BY
i.createTime asc
LIMIT 1
</select>
</mapper>

18
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerCrmVehVo.java

@ -0,0 +1,18 @@
package com.yxt.anrui.as.api.ascustomervehicle;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/3/19 11:52
*/
@Data
public class AsCustomerCrmVehVo implements Vo {
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
}

86
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicle.java

@ -0,0 +1,86 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.ascustomervehicle;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicle.java <br/>
* Class: as.api.ascustomervehicle.AsCustomerVehicle <br/>
* Description: 客户车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户车辆信息", description = "客户车辆信息")
@TableName("as_customer_vehicle")
public class AsCustomerVehicle extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private Integer mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private Integer lastMileage; // 上次保养里程
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("下次保养日期")
private Date nextMaintainDate; // 下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("购车日期")
private Date buyDate; // 购车日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("商业险到期日期")
private Date commercialInsuranceEndDate; // 商业险到期日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交强险到期日期")
private Date compulsoryInsuranceEndDate; // 交强险到期日期
@ApiModelProperty("0为内部车,1为外部车")
private Integer vehState; // 0为内部车,1为外部车
}

91
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetailsVo.java

@ -0,0 +1,91 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.ascustomervehicle;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleVo.java <br/>
* Class: as.api.ascustomervehicle.AsCustomerVehicleVo <br/>
* Description: 客户车辆信息 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户车辆信息 视图数据详情", description = "客户车辆信息 视图数据详情")
public class AsCustomerVehicleDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private Integer mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private Integer lastMileage; // 上次保养里程
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("下次保养日期")
private Date nextMaintainDateStart; // 下次保养日期
private Date nextMaintainDateEnd; // 下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("购车日期")
private Date buyDateStart; // 购车日期
private Date buyDateEnd; // 购车日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("商业险到期日期")
private Date commercialInsuranceEndDateStart; // 商业险到期日期
private Date commercialInsuranceEndDateEnd; // 商业险到期日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交强险到期日期")
private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
@ApiModelProperty("0为内部车,1为外部车")
private Integer vehState; // 0为内部车,1为外部车
}

91
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDto.java

@ -0,0 +1,91 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.ascustomervehicle;
import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleDto.java <br/>
* Class: as.api.ascustomervehicle.AsCustomerVehicleDto <br/>
* Description: 客户车辆信息 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户车辆信息 数据传输对象", description = "客户车辆信息 数据传输对象")
public class AsCustomerVehicleDto implements Dto {
private String sid; // sid
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private Integer mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private Integer lastMileage; // 上次保养里程
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("下次保养日期")
private Date nextMaintainDateStart; // 下次保养日期
private Date nextMaintainDateEnd; // 下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("购车日期")
private Date buyDateStart; // 购车日期
private Date buyDateEnd; // 购车日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("商业险到期日期")
private Date commercialInsuranceEndDateStart; // 商业险到期日期
private Date commercialInsuranceEndDateEnd; // 商业险到期日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交强险到期日期")
private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
@ApiModelProperty("0为内部车,1为外部车")
private Integer vehState; // 0为内部车,1为外部车
}

89
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleQuery.java

@ -0,0 +1,89 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.ascustomervehicle;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleQuery.java <br/>
* Class: as.api.ascustomervehicle.AsCustomerVehicleQuery <br/>
* Description: 客户车辆信息 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户车辆信息 查询条件", description = "客户车辆信息 查询条件")
public class AsCustomerVehicleQuery implements Query {
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private Integer mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private Integer lastMileage; // 上次保养里程
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("下次保养日期")
private Date nextMaintainDateStart; // 下次保养日期
private Date nextMaintainDateEnd; // 下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("购车日期")
private Date buyDateStart; // 购车日期
private Date buyDateEnd; // 购车日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("商业险到期日期")
private Date commercialInsuranceEndDateStart; // 商业险到期日期
private Date commercialInsuranceEndDateEnd; // 商业险到期日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交强险到期日期")
private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
@ApiModelProperty("0为内部车,1为外部车")
private Integer vehState; // 0为内部车,1为外部车
}

91
yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java

@ -0,0 +1,91 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.api.ascustomervehicle;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleVo.java <br/>
* Class: as.api.ascustomervehicle.AsCustomerVehicleVo <br/>
* Description: 客户车辆信息 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "客户车辆信息 视图数据对象", description = "客户车辆信息 视图数据对象")
public class AsCustomerVehicleVo implements Vo {
private String sid; // sid
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("发动机号")
private String engineNo; // 发动机号
@ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
@ApiModelProperty("行驶里程")
private Integer mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
private Integer lastMileage; // 上次保养里程
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("下次保养日期")
private Date nextMaintainDateStart; // 下次保养日期
private Date nextMaintainDateEnd; // 下次保养日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("购车日期")
private Date buyDateStart; // 购车日期
private Date buyDateEnd; // 购车日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("商业险到期日期")
private Date commercialInsuranceEndDateStart; // 商业险到期日期
private Date commercialInsuranceEndDateEnd; // 商业险到期日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交强险到期日期")
private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
@ApiModelProperty("0为内部车,1为外部车")
private Integer vehState; // 0为内部车,1为外部车
}

69
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java

@ -0,0 +1,69 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.ascustomervehicle;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerCrmVehVo;
import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicle;
import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicleVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleMapper.java <br/>
* Class: as.biz.ascustomervehicle.AsCustomerVehicleMapper <br/>
* Description: 客户车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsCustomerVehicleMapper extends BaseMapper<AsCustomerVehicle> {
//@Update("update as_customer_vehicle set name=#{msg} where id=#{id}")
//IPage<AsCustomerVehicleVo> voPage(IPage<AsCustomerVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<AsCustomerVehicle> qw);
IPage<AsCustomerVehicleVo> selectPageVo(IPage<AsCustomerVehicle> page, @Param(Constants.WRAPPER) Wrapper<AsCustomerVehicle> qw);
List<AsCustomerVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsCustomerVehicle> qw);
@Select("select * from as_customer_vehicle")
List<AsCustomerVehicleVo> selectListVo();
@Select("select * from as_customer_vehicle")
List<AsCustomerCrmVehVo> listCustomerVeh();
}

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.as.biz.ascustomervehicle.AsCustomerVehicleMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicleVo">
SELECT * FROM as_customer_vehicle <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicleVo">
SELECT * FROM as_customer_vehicle <where> ${ew.sqlSegment} </where>
</select>
</mapper>

102
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java

@ -0,0 +1,102 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.ascustomervehicle;
import com.yxt.anrui.as.api.ascustomervehicle.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleFeignFallback.java <br/>
* Class: as.biz.ascustomervehicle.AsCustomerVehicleRest <br/>
* Description: 客户车辆信息. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "客户车辆信息")
@RestController
@RequestMapping("as/v1/ascustomervehicle")
public class AsCustomerVehicleRest{
@Autowired
private AsCustomerVehicleService asCustomerVehicleService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<AsCustomerVehicleVo>> listPage(@RequestBody PagerQuery<AsCustomerVehicleQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<AsCustomerVehicleVo> pv = asCustomerVehicleService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("查询数据的列表")
@PostMapping("/listCustomerVeh")
public ResultBean<List<AsCustomerCrmVehVo>> listCustomerVeh(){
ResultBean rb = ResultBean.fireFail();
List<AsCustomerCrmVehVo> list = asCustomerVehicleService.listCustomerVeh();
return rb.success().setData(list);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AsCustomerVehicleDto dto){
ResultBean rb = ResultBean.fireFail();
asCustomerVehicleService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
asCustomerVehicleService.delBySids(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AsCustomerVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
AsCustomerVehicleDetailsVo vo = asCustomerVehicleService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

109
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@ -0,0 +1,109 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.ascustomervehicle;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.ascustomervehicle.*;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: asdfasd(sdg) <br/>
* File: AsCustomerVehicleService.java <br/>
* Class: as.biz.ascustomervehicle.AsCustomerVehicleService <br/>
* Description: 客户车辆信息 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-19 11:28:19 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehicleMapper, AsCustomerVehicle> {
private QueryWrapper<AsCustomerVehicle> createQueryWrapper(AsCustomerVehicleQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<AsCustomerVehicle> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<AsCustomerVehicleVo> listPageVo(PagerQuery<AsCustomerVehicleQuery> pq) {
AsCustomerVehicleQuery query = pq.getParams();
QueryWrapper<AsCustomerVehicle> qw = createQueryWrapper(query);
IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
IPage<AsCustomerVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<AsCustomerVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(AsCustomerVehicleDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(AsCustomerVehicleDto dto){
AsCustomerVehicle entity = new AsCustomerVehicle();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(AsCustomerVehicleDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
AsCustomerVehicle entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public AsCustomerVehicleDetailsVo fetchDetailsVoBySid(String sid){
AsCustomerVehicle entity = fetchBySid(sid);
AsCustomerVehicleDetailsVo vo = new AsCustomerVehicleDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<AsCustomerCrmVehVo> listCustomerVeh() {
return baseMapper.listCustomerVeh();
}
}
Loading…
Cancel
Save