更改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java

@@ -29,6 +29,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PayApplyTrailerQuery implements Query {
 
@@ -42,4 +44,5 @@ public class PayApplyTrailerQuery implements Query {
 	private String customerName;
 
 	private String useOrgSid;
+	private List<String> sids;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java

@@ -29,6 +29,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PayApplyTopQuery implements Query {
 
@@ -40,4 +42,5 @@ public class PayApplyTopQuery implements Query {
 	private String customerName;
 
 	private String useOrgSid;
+	private List<String> sids;
 }

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

@@ -111,9 +111,18 @@
     <select id="payApply" resultType="com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo">
         SELECT btm.trailerTypeValue,
         CONCAT(
+        '长',
         btm.appearanceSizeLong,
+        'mm，',
+        '宽',
         btm.appearanceSizeWide,
-        btm.appearanceSizeHigh
+        'mm，',
+        '高',
+        btm.appearanceSizeHigh,
+        'mm，',
+        '总高',
+        btm.appearanceSizeTotalHigh,
+        'mm'
         ) AS size,
         bt.vinNo,
         bt.sid AS trailerSid,

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

@@ -1001,6 +1001,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getTrailerTypeValue())) {
             qw.like("btm.trailerTypeValue", query.getTrailerTypeValue());
         }
+        if (query.getSids().size() > 0) {
+            qw.notIn("bt.sid", query.getSids());
+        }
         IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
         IPage<PayApplyTrailerVo> pagging = baseMapper.payApply(page, qw);
         PagerVo<PayApplyTrailerVo> p = PagerUtil.pageToVo(pagging, null);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -69,9 +69,15 @@
     <select id="payApply" resultType="com.yxt.anrui.base.api.basevehinstall.PayApplyTopVo">
         SELECT bvm.installNameValue,
         CONCAT(
+        '长',
         bvm.wk_long,
+        'mm，',
+        '宽',
         bvm.wk_wide,
-        bvm.wk_high
+        'mm，',
+        '高',
+        bvm.wk_high,
+        'mm'
         ) AS size,
         bv.vinNo,
         bv.sid AS topSid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -535,6 +535,9 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         if (StringUtils.isNotBlank(query.getInstallNameValue())) {
             qw.like("bvm.installNameValue", query.getInstallNameValue());
         }
+        if (query.getSids().size() > 0) {
+            qw.notIn("bv.sid", query.getSids());
+        }
         IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
         IPage<PayApplyTopVo> pagging = baseMapper.payApply(page, qw);
         PagerVo<PayApplyTopVo> p = PagerUtil.pageToVo(pagging, null);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -83,6 +87,10 @@ public class FinPaymentapplyDetailsVo implements Vo {
     private List<FinPaymentapplyDetailVo> detailsList = new ArrayList<>();
 
     private List<FinPaymentapplyVehicleVo> vehicleList = new ArrayList<>();
+
+    private List<FinPaymentapplyTrailerDetailsVo> trailerList;
+    private List<FinPaymentapplyTopDetailsVo> topList;
+
     private String isVeh;
 
     @ApiModelProperty(value = "品牌sid")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -48,7 +48,9 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
@@ -382,6 +384,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid);
         vo.setDetailsList(detailsList);
         vo.setVehicleList(vehicleList);
+        List<FinPaymentapplyTrailerDetailsVo> finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid);
+        List<FinPaymentapplyTopDetailsVo> finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid);
+        vo.setTrailerList(finPaymentapplyTrailerDetailsVos);
+        vo.setTopList(finPaymentapplyTopDetailsVos);
         return vo;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java

@@ -26,13 +26,20 @@
 package com.yxt.anrui.fin.biz.finpaymentapplytop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface FinPaymentapplyTopMapper extends BaseMapper<FinPaymentapplyTop> {
 
     @Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}")
     void delByMainSid(String dtoSid);
+
+    @Select("select * from fin_paymentapply_top where applySid = #{mainSid}")
+    List<FinPaymentapplyTopDetailsVo> fetchByMainSid(String mainSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(付款申请) <br/>
  * File: FinPaymentapplyTopService.java <br/>
@@ -64,4 +66,8 @@ public class FinPaymentapplyTopService extends MybatisBaseService<FinPaymentappl
 	public void delByMainSid(String dtoSid) {
 		baseMapper.delByMainSid(dtoSid);
 	}
+
+	public List<FinPaymentapplyTopDetailsVo> fetchByMainSid(String mainSid) {
+		return baseMapper.fetchByMainSid(mainSid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java

@@ -26,13 +26,20 @@
 package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface FinPaymentapplyTrailerMapper extends BaseMapper<FinPaymentapplyTrailer> {
 
     @Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}")
     void delByMainSid(String dtoSid);
+
+    @Select("select * from fin_paymentapply_trailer where applySid = #{mainSid}")
+    List<FinPaymentapplyTrailerDetailsVo> fetchByMainSid(String mainSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(付款申请) <br/>
  * File: FinPaymentapplyTrailerService.java <br/>
@@ -64,4 +66,8 @@ public class FinPaymentapplyTrailerService extends MybatisBaseService<FinPayment
 	public void delByMainSid(String dtoSid) {
 		baseMapper.delByMainSid(dtoSid);
 	}
+
+	public List<FinPaymentapplyTrailerDetailsVo> fetchByMainSid(String mainSid) {
+		return baseMapper.fetchByMainSid(mainSid);
+	}
 }