From 75fc38d57c672317b71ce7b03fe2d8e7f1402f3d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 8 Oct 2022 16:17:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleBrandMapper.java | 2 ++ .../BaseVehicleBrandMapper.xml | 5 +++++ .../BaseVehicleBrandService.java | 4 ++++ .../commoncontract/CommonContractService.java | 20 +++++++++++-------- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index d84303c337..9c5ccaac15 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -127,4 +127,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper { @Select("SELECT DISTINCT manufacturerSid FROM base_vehicle_brand WHERE useOrg LIKE %#{orgSid}%") List selectManSidByOrgSid(String orgSid); + + String selectShortName(String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index e151148357..717dec7041 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -112,4 +112,9 @@ FROM base_vehicle_brand bvb where find_in_set(#{useOrg}, bvb.useOrg) + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index 00088e42f9..ec3e8ceb14 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -233,4 +233,8 @@ public class BaseVehicleBrandService extends MybatisBaseService selectManSidByOrgSid(String orgSid) { return baseMapper.selectManSidByOrgSid(orgSid); } + + public String selectShortName(String modelSid) { + return baseMapper.selectShortName(modelSid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index d3a1a5309c..23753ca173 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,10 +18,8 @@ import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; -import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.CommonContractEnum; import com.yxt.anrui.base.common.utils.Rule; -import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign; @@ -1322,7 +1321,7 @@ public class CommonContractService extends MybatisBaseService resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); - String orgCode = resultBean1.getData().getOrgCode(); - BillNo b = new BillNo(); +// String orgCode = resultBean1.getData().getOrgCode(); + String orgCode = resultBean1.getData().getOrgAbbre(); + //根据车型sid查询品牌简称 + String brandCode = baseVehicleBrandService.selectShortName(modelSid); + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + String bill = brandCode+orgCode+date; + /* BillNo b = new BillNo(); b.setOrgCode(orgCode); b.setBillType(BillTypeEnum.XSDD.getBillType()); - String bill = Rule.getBill(b); + String bill = Rule.getBill(b);*/ int i = baseMapper.selectNum(bill); String billNo = Rule.getBillNo(bill, i); return billNo; @@ -1656,7 +1660,7 @@ public class CommonContractService extends MybatisBaseService getContractByBusSid(String sid) { ResultBean rb = ResultBean.fireFail(); CommonContract commonContract = baseMapper.getContractByBusSid(sid); - if(commonContract == null){ + if (commonContract == null) { return rb.setData(new CommonContract()); } return rb.success().setData(commonContract);