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

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

@@ -98,4 +98,13 @@
                      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;
@@ -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());