diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java index b82f58db33..aba423ec66 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java +++ b/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 sids; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java index 8c300f8da7..9158552f64 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java +++ b/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 sids; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml index 26ddc0aa21..e30af2a1b6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml @@ -111,9 +111,18 @@ 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, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index 9de9328352..97e19471f7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/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 0) { + qw.notIn("bv.sid", query.getSids()); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.payApply(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java index 3d9cbe5cd4..7bde24f907 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java +++ b/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 detailsList = new ArrayList<>(); private List vehicleList = new ArrayList<>(); + + private List trailerList; + private List topList; + private String isVeh; @ApiModelProperty(value = "品牌sid") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index d788450300..d90cb9987c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/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 vehicleList = finPaymentapplyVehicleService.getVehicleList(sid); vo.setDetailsList(detailsList); vo.setVehicleList(vehicleList); + List finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid); + List finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid); + vo.setTrailerList(finPaymentapplyTrailerDetailsVos); + vo.setTopList(finPaymentapplyTopDetailsVos); return vo; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java index 484897ca3c..3414ef5c1a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java +++ b/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 { - @Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}") - void delByMainSid(String dtoSid); + @Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from fin_paymentapply_top where applySid = #{mainSid}") + List fetchByMainSid(String mainSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java index aed39eae74..277de88a55 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java +++ b/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(付款申请)
* File: FinPaymentapplyTopService.java
@@ -64,4 +66,8 @@ public class FinPaymentapplyTopService extends MybatisBaseService fetchByMainSid(String mainSid) { + return baseMapper.fetchByMainSid(mainSid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java index 8e457ee1c5..aac8315e08 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java +++ b/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 { - @Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}") - void delByMainSid(String dtoSid); + @Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}") + void delByMainSid(String dtoSid); + + @Select("select * from fin_paymentapply_trailer where applySid = #{mainSid}") + List fetchByMainSid(String mainSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java index ffb5560be1..967328bd51 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java +++ b/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(付款申请)
* File: FinPaymentapplyTrailerService.java
@@ -64,4 +66,8 @@ public class FinPaymentapplyTrailerService extends MybatisBaseService fetchByMainSid(String mainSid) { + return baseMapper.fetchByMainSid(mainSid); + } } \ No newline at end of file