优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java

@@ -55,4 +55,8 @@ public interface BusTransferRecordsFeign {
     @ApiOperation("移交记录确认")
     @PostMapping("/confirmRecords")
     ResultBean confirmRecords(@RequestBody ConfirmRecordsQuery query);
+
+    @ApiOperation("查看车辆发票记录")
+    @GetMapping("/selectByVinSidAndKey")
+    ResultBean<BusTransferRecords> selectByVinSidAndKey(@RequestParam("vinSid") String vinSid,@RequestParam("goodsTypeKey") String goodsTypeKey);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@@ -33,4 +33,6 @@ public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords>
 
     @Select("select * from bus_transfer_records where sid = #{sid}")
     BusRecordsInvoiceHgzVo getInvoiceInfoHgz(String sid);
+
+    BusTransferRecords selectByVinSidAndKey(@Param("vinSid") String vinSid,@Param("goodsTypeKey") String goodsTypeKey);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@@ -48,4 +48,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectByVinSidAndKey" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords">
+        select *
+        from bus_transfer_records
+        where vinSid = #{vinSid}
+        and goodsTypeKey = #{goodsTypeKey}
+        order by id desc limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java

@@ -65,4 +65,9 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign {
     public ResultBean confirmRecords(ConfirmRecordsQuery query) {
         return busTransferRecordsService.confirmRecords(query);
     }
+
+    @Override
+    public ResultBean<BusTransferRecords> selectByVinSidAndKey(String vinSid, String goodsTypeKey) {
+        return busTransferRecordsService.selectByVinSidAndKey(vinSid,goodsTypeKey);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -340,4 +340,10 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
         busRecordsInvoiceHgzVo.setReceiveFilesList(receiveFilesList);
         return rb.success().setData(busRecordsInvoiceHgzVo);
     }
+
+    public ResultBean<BusTransferRecords> selectByVinSidAndKey(String vinSid, String goodsTypeKey) {
+        ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
+        BusTransferRecords BusTransferRecords = baseMapper.selectByVinSidAndKey(vinSid, goodsTypeKey);
+        return rb.success().setData(BusTransferRecords);
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineDetailsVo.java

@@ -63,6 +63,10 @@ public class LoanFileexamineDetailsVo implements Vo {
     private String staffName;
     @ApiModelProperty("车架号拼接")
     private String vinNo;
+    @ApiModelProperty("合格证图片")
+    private List<String> hgzImages;
+    @ApiModelProperty("发票图片")
+    private List<String> fpImages;
     @ApiModelProperty("银行卡")
     private List<String> yhkImages;
     @ApiModelProperty("购置税发票")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineQuery.java

@@ -69,10 +69,6 @@ public class LoanFileexamineQuery implements Query {
     private String bankContractNo;
     @ApiModelProperty("资方状态value")
     private String bankStateValue;
-    @ApiModelProperty("电子件状态")
-    private String dzjState;
-    @ApiModelProperty("原件状态")
-    private String yjState;
     @ApiModelProperty("资料状态")
     private String zlState;
     @ApiModelProperty("组织全路径")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfileexamine/LoanFileexamineVo.java

@@ -59,10 +59,6 @@ public class LoanFileexamineVo implements Vo {
     private String staffName;
     @ApiModelProperty("资方状态value")
     private String bankStateValue;
-    @ApiModelProperty("电子件状态")
-    private String dzjState;
-    @ApiModelProperty("原件状态")
-    private String yjState;
     @ApiModelProperty("资料状态")
     private String zlState;
     @ApiModelProperty("消贷合同编号")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineMapper.xml

@@ -10,8 +10,7 @@
         bo.`orgName`,
         bo.`staffName`,
         lf.`bankStateValue`,
-        IF(lf.`dzjState` = '0', '未齐全', '已齐全'),
+        IF(lf.`zlState` = '0', '未齐全', '已齐全'),
-        IF(lf.`yjState` = '0', '未齐全', '已齐全'),
         bl.`loanContractNo`,
         bl.`vehCount` AS num,
         bl.`borrowerName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.riskcenter.biz.loanfileexamine;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
@@ -35,6 +38,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoanco
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
+import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
+import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
@@ -91,11 +96,17 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private BusTransferRecordsFeign busTransferRecordsFeign;
 
     public PagerVo<LoanFileexamineVo> listPageVo(PagerQuery<LoanFileexamineQuery> pq) {
         LoanFileexamineQuery query = pq.getParams();
         QueryWrapper<LoanFileexamine> qw = new QueryWrapper<>();
-		qw.eq("bl.busNo",305);
+        qw.eq("bl.busNo", 305);
         if (StringUtils.isNotBlank(query.getMenuUrl())) {
             //=======================
             PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@@ -162,11 +173,8 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         if (StringUtils.isNotBlank(query.getBankStateValue())) {
             qw.like("lf.bankStateValue", query.getBankStateValue());
         }
-		if (StringUtils.isNotBlank(query.getDzjState())) {
+        if (StringUtils.isNotBlank(query.getZlState())) {
-			qw.eq("lf.dzjState", query.getDzjState());
+            qw.eq("lf.zlState", query.getZlState());
-		}
-		if (StringUtils.isNotBlank(query.getYjState())) {
-			qw.eq("lf.yjState", query.getYjState());
         }
         IPage<LoanFileexamine> page = PagerUtil.queryToPage(pq);
         IPage<LoanFileexamineVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -174,7 +182,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         return p;
     }
 
-	public void saveOrUpdateDto(LoanFileexamineDto dto){
+    public void saveOrUpdateDto(LoanFileexamineDto dto) {
         String dtoSid = dto.getSid();
         List<String> yhkImages = dto.getYhkImages();
         List<String> gzsfpImages = dto.getGzsfpImages();
@@ -310,14 +318,14 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         }
     }
 
-	public String insertByDto(LoanFileexamineDto dto){
+    public String insertByDto(LoanFileexamineDto dto) {
         LoanFileexamine entity = new LoanFileexamine();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
         return entity.getSid();
     }
 
-	public void updateByDto(LoanFileexamineDto dto){
+    public void updateByDto(LoanFileexamineDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -327,7 +335,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         baseMapper.updateById(entity);
     }
 
-	public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid){
+    public LoanFileexamineDetailsVo fetchDetailsVoBySid(String sid) {
         LoanFileexamine entity = fetchBySid(sid);
         LoanFileexamineDetailsVo vo = new LoanFileexamineDetailsVo();
         BeanUtil.copyProperties(entity, vo);
@@ -342,11 +350,33 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
             vinNos = vinNos + busSalesOrderVehicle.getLinkNo() + ",";
         }
-		vo.setVinNo(vinNos.substring(0,vinNos.lastIndexOf(",")));
+        vo.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
+        List<String> hgzImages = new ArrayList<>();
+        List<String> fpImages = new ArrayList<>();
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busSalesOrderVehicle.getLinkSid()).getData();
+            //合格证
+            List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+            for (String s : stringList) {
+                hgzImages.add(s);
+            }
+            BusTransferRecords busTransferRecords = busTransferRecordsFeign.selectByVinSidAndKey(busSalesOrderVehicle.getLinkSid(), "01").getData();
+            String transferFiles = busTransferRecords.getTransferFiles();
+            if (StringUtils.isNotBlank(transferFiles)){
+                String[] split = transferFiles.split(",");
+                for (String s : split) {
+                    String urlPrefix = fileUploadComponent.getUrlPrefix();
+                    s = urlPrefix + s;
+                    fpImages.add(s);
+                }
+            }
+        }
+        vo.setHgzImages(hgzImages);
+        vo.setFpImages(fpImages);
         //银行卡
         List<LoanHomevisitInvestigateFileDetailsVo> yhkVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
         List<String> yhkImages = new ArrayList<>();
-		if (yhkVos != null && yhkVos.size() > 0){
+        if (yhkVos != null && yhkVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : yhkVos) {
                 yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }
@@ -355,7 +385,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         //购置税发票
         List<LoanHomevisitInvestigateFileDetailsVo> gzsfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.GZSFP.getAttachType());
         List<String> gzsfpImages = new ArrayList<>();
-		if (gzsfpVos != null && gzsfpVos.size() > 0){
+        if (gzsfpVos != null && gzsfpVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : gzsfpVos) {
                 gzsfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }
@@ -364,7 +394,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         //保险发票
         List<LoanHomevisitInvestigateFileDetailsVo> bxfpVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BXFP.getAttachType());
         List<String> bxfpImages = new ArrayList<>();
-		if (bxfpVos != null && bxfpVos.size() > 0){
+        if (bxfpVos != null && bxfpVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bxfpVos) {
                 bxfpImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }
@@ -373,7 +403,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         //保单
         List<LoanHomevisitInvestigateFileDetailsVo> bdVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.BD.getAttachType());
         List<String> bdImages = new ArrayList<>();
-		if (bdVos != null && bdVos.size() > 0){
+        if (bdVos != null && bdVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : bdVos) {
                 bdImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }
@@ -382,7 +412,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         //融资合同
         List<LoanHomevisitInvestigateFileDetailsVo> rzhtVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.RZHT.getAttachType());
         List<String> rzhtImages = new ArrayList<>();
-		if (rzhtVos != null && rzhtVos.size() > 0){
+        if (rzhtVos != null && rzhtVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : rzhtVos) {
                 rzhtImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }
@@ -391,7 +421,7 @@ public class LoanFileexamineService extends MybatisBaseService<LoanFileexamineMa
         //证明附件
         List<LoanHomevisitInvestigateFileDetailsVo> zmfjVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.ZMFJ.getAttachType());
         List<String> zmfjImages = new ArrayList<>();
-		if (zmfjVos != null && zmfjVos.size() > 0){
+        if (zmfjVos != null && zmfjVos.size() > 0) {
             for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : zmfjVos) {
                 zmfjImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
             }