金融报价单完善挂车类型和厂商名称

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -31,6 +31,7 @@ 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.base.api.basetrailer.*;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -106,4 +107,6 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid} order by id desc limit 1")
     BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
+
+    List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml

@@ -5,10 +5,10 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetrailer.BaseTrailerVo">
         SELECT bt.*,
-               btm.*
+        btm.*
         FROM base_trailer bt
-                 LEFT JOIN base_trailer_model btm
-                           ON bt.`trailerModelSid` = btm.`sid`
+        LEFT JOIN base_trailer_model btm
+        ON bt.`trailerModelSid` = btm.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -51,15 +51,15 @@
         <!--价格有效期-->
         DATE_FORMAT(bt.priceValidity, '%Y-%m-%d') as priceValidity
         FROM base_trailer bt
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
-        select RIGHT(billNo, 4)
+        select RIGHT (billNo, 4)
         from base_vehicle_out_apply
         where billNo LIKE concat(#{billNo}, '%')
         order by billNo desc
-        limit 1
+                limit 1
     </select>
 
     <select id="selectNumGCRK" resultType="int">
@@ -95,7 +95,16 @@
                btm.boxColor,
                btm.moreConfig
         from base_trailer bt
-                 left join base_trailer_model btm on btm.sid = bt.trailerModelSid
+                     left join base_trailer_model btm on btm.sid = bt.trailerModelSid
         where bt.vehSid = #{vinSid}
     </select>
+
+    <select id="fetchTypeAndMan" resultType="com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo">
+        SELECT btm.trailerTypeValue,
+               btm.manufacturerName
+        FROM base_trailer bt
+                     LEFT JOIN base_trailer_model btm
+                ON bt.`trailerModelSid` = btm.`sid`
+        WHERE bt.vehSid = #{materialSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -949,4 +949,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
         return rb.success().setData(baseTrailerDetailsVo);
     }
+
+    public List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String vehSid) {
+        return baseMapper.fetchTypeAndMan(vehSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
+import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -1762,7 +1763,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success();
     }
 
-    private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto,String otherNum) {
+    private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto, String otherNum) {
         OtherReceivable otherReceivableOne = new OtherReceivable();
         otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo() + "-" + otherNum);
         otherReceivableOne.setCommUnit(zcDto.getCwCustomerNo());
@@ -1782,16 +1783,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
             String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
             int qtMoney = 0;
-            if (StringUtils.isNotBlank(otherReceivableMoney)){
+            if (StringUtils.isNotBlank(otherReceivableMoney)) {
                 qtMoney = Integer.parseInt(otherReceivableMoney);
             }
             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
             String serviceAmount = solutionsDetailsVo.getServiceAmount();
             int fwfMoney = 0;
-            if (StringUtils.isNotBlank(serviceAmount)){
+            if (StringUtils.isNotBlank(serviceAmount)) {
                 fwfMoney = Integer.parseInt(serviceAmount);
             }
-            if (qtMoney >  0 && fwfMoney > 0) {
+            if (qtMoney > 0 && fwfMoney > 0) {
                 collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
                 collectionDetailDtoOne.setUseTo("YT017");
                 collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
@@ -2217,11 +2218,11 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         File xsddspFile = new File(docPdfComponent.getUploadTemplateUrl() + xsddspUrl);
         filesList.add(xsddspFile);
         //生成金融报价单
-        if ("002".equals(baseVehicleOut1.getTypeKey()) && "001".equals(baseVehicleOut1.getMaterialTypeKey())){
+        if ("002".equals(baseVehicleOut1.getTypeKey()) && "001".equals(baseVehicleOut1.getMaterialTypeKey())) {
             String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData();
             if (StringUtils.isNotBlank(ckSid)) {
                 String jrbjdUrl = createjrbjdPdfHB(ckSid, baseVehicleOut1.getVinSid());
-                if (!"1".equals(jrbjdUrl)){
+                if (!"1".equals(jrbjdUrl)) {
                     File jrbjdFile = new File(docPdfComponent.getUploadTemplateUrl() + jrbjdUrl);
                     filesList.add(jrbjdFile);
                 }
@@ -2365,7 +2366,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //销售人员
         baseQuotationVo.setStaffName(busSalesOrder.getStaffName());
         //销售消贷合同信息
-        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())){
+        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLoanContractSid())) {
             BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(busSalesOrderVehicle.getLoanContractSid()).getData();
             //贷款合同编号
             baseQuotationVo.setLoanContractNo(busSalesOrderLoancontractDetailsVo.getLoanContractNo());
@@ -2616,19 +2617,19 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         //车型及价格
         dataMap.put("modelName", baseQuotationVo.getModelName());
         //查询挂车信息
-        List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(vehSid);
+        List<BaseTrailerModelDetailsVo> baseTrailerVos = baseTrailerService.fetchTypeAndMan(vehSid);
         if (baseTrailerVos.size() == 1) {
-            BaseTrailerVo baseTrailerVo = baseTrailerVos.get(0);
-            dataMap.put("gcOneModel", baseTrailerVo.getTrailerModel());
-            dataMap.put("gcOnePurUnit", "");
+            BaseTrailerModelDetailsVo baseTrailerVo = baseTrailerVos.get(0);
+            dataMap.put("gcOneModel", baseTrailerVo.getTrailerTypeValue());
+            dataMap.put("gcOnePurUnit", baseTrailerVo.getManufacturerName());
         } else if (baseTrailerVos.size() > 1) {
-            BaseTrailerVo baseTrailerVo1 = baseTrailerVos.get(0);
-            dataMap.put("gcOneModel", baseTrailerVo1.getTrailerModel());
-            dataMap.put("gcOnePurUnit", "");
+            BaseTrailerModelDetailsVo baseTrailerVo1 = baseTrailerVos.get(0);
+            dataMap.put("gcOneModel", baseTrailerVo1.getTrailerTypeValue());
+            dataMap.put("gcOnePurUnit", baseTrailerVo1.getManufacturerName());
 
-            BaseTrailerVo baseTrailerVo2 = baseTrailerVos.get(1);
-            dataMap.put("gcTwoModel", baseTrailerVo2.getTrailerModel());
-            dataMap.put("gcTwoPurUnit", "");
+            BaseTrailerModelDetailsVo baseTrailerVo2 = baseTrailerVos.get(1);
+            dataMap.put("gcTwoModel", baseTrailerVo2.getTrailerTypeValue());
+            dataMap.put("gcTwoPurUnit", baseTrailerVo2.getManufacturerName());
         }
         //查询上装信息
         BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(baseVehicle.getVinNo(), busDeliveredApply.getUseOrgSid());