Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -136,8 +136,13 @@ public interface BaseVehicleCertificateFeign {
     @ResponseBody
     ResultBean updateCertificate(@RequestBody CertificateDto dto);
 
-    @ApiOperation("交车准备获取合格证信息")
+  /*  @ApiOperation("交车准备获取合格证信息")
     @GetMapping("/getCertificateInfo/{vinNo}/{userSid}")
     @ResponseBody
     ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(@PathVariable("vinNo") String vinNo, @PathVariable("userSid") String userSid);
+*/
+    @ApiOperation("交车准备获取合格证信息")
+    @GetMapping("/getCertificateInfo")
+    @ResponseBody
+    ResultBean<HandoverCertVo> getCertificateInfoOne(@RequestParam("vinSid") String vinSid, @RequestParam("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -83,8 +83,13 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
     }
 
     @Override
-    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid, String useOrgSid) {
         return null;
     }
 
+  /*  @Override
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        return null;
+    }*/
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/HandoverCertVo.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.base.api.basevehiclecertificate;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 车辆合格证
+ * @author: dimengzhe
+ * @date: 2023/5/30
+ **/
+@Data
+public class HandoverCertVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆型号")
+    private String carModel;
+    @ApiModelProperty("合格证编号")
+    private String certificationNo;
+    @ApiModelProperty("发证日期")
+    private String certificateDate;
+    @ApiModelProperty("合格证照片，多张")
+    private List<String> certificatePhotoList = new ArrayList<>();
+
+    private String certificatePhoto;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -100,4 +100,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("sid") String sid);
 
     int updateCertificate(@Param("dto") CertificateDto dto);
+
+    HandoverCertVo getCertificateInfoOne(@Param("vinSid") String vinSid, @Param("useOrgSid") String useOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -270,4 +270,8 @@
             axleNum          = #{dto.axleNum}
         where vinNo = #{dto.vinNo}
     </update>
+
+    <select id="getCertificateInfoOne" resultType="com.yxt.anrui.base.api.basevehiclecertificate.HandoverCertVo">
+        select vinNo,carModel,certificationNo, DATE_FORMAT(certificateDate, '%Y-%m-%d') as certificateDate,certificatePhoto from base_vehicle_certificate where vehicleSid = #{vinSid} and useOrgSid = #{useOrgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -305,9 +305,14 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
     }
 
     @Override
+    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid, String useOrgSid) {
+        return baseVehicleCertificateService.getCertificateInfoOne(vinSid, useOrgSid);
+    }
+
+   /* @Override
     public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
         return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid);
-    }
+    }*/
 
     /**
      * @param sheet      单元格

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -19,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -224,4 +223,16 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         vo.setInvoiceImages(invoiceImages);
         return rb;
     }
+
+    public ResultBean<HandoverCertVo> getCertificateInfoOne(String vinSid, String useOrgSid) {
+        ResultBean<HandoverCertVo> rb = ResultBean.fireFail();
+        HandoverCertVo handoverCertVo = baseMapper.getCertificateInfoOne(vinSid,useOrgSid);
+        if(handoverCertVo != null){
+            if(StringUtils.isNotBlank(handoverCertVo.getCertificatePhoto())){
+                List<String> photoList = Arrays.asList(handoverCertVo.getCertificatePhoto().split(","));
+                handoverCertVo.setCertificatePhotoList(photoList);
+            }
+        }
+        return rb.success().setData(handoverCertVo);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java

@@ -10,9 +10,7 @@ public class AppCertificateInfoQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vin;
-
     @ApiModelProperty("用户sid")
     private String userSid;
-
     private String sid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java

@@ -10,7 +10,7 @@ import java.util.List;
 public class AppCertificateInfoVo implements Vo {
     private static final long serialVersionUID = -4673876588141577559L;
 
-    private String sid;
+    /*private String sid;
 
     @ApiModelProperty("车架号")
     private String vin;
@@ -19,6 +19,19 @@ public class AppCertificateInfoVo implements Vo {
     @ApiModelProperty("合格证日期")
     private String date;
     @ApiModelProperty("合格证附件")
-    private List<String> invoiceImages;
+    private List<String> invoiceImages;*/
+
+    @ApiModelProperty("交车准备的关联车辆表的sid")
+    private String sid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆型号")
+    private String carModel;
+    @ApiModelProperty("合格证编号")
+    private String certificationNo;
+    @ApiModelProperty("发证日期")
+    private String certificateDate;
+    @ApiModelProperty("合格证照片，多张")
+    private List<String> certificatePhoto;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -30,8 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehiclecertificate.AppHandoverCertificateInfoVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.HandoverCertVo;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
@@ -170,6 +170,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 手机端-获取交车准备申请列表
+     *
      * @param pagerQuery
      * @return
      */
@@ -192,7 +193,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         privilegeQuery.setMenuUrl(params.getMenuUrl());
         privilegeQuery.setUserSid(params.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
             //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
             String orgSidPath = params.getOrgPath();
             orgSidPath = orgSidPath + "/";
@@ -213,13 +214,13 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
                 qw.like("orgSidPath", orgSidPath);
-            } else if("5".equals(orgLevelKey)){
-                qw.eq("createBySid",params.getUserSid());
-            }else{
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("createBySid", params.getUserSid());
+            } else {
                 PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
                 return p;
             }
-        }else{
+        } else {
             PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
             return p;
         }
@@ -229,14 +230,14 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
        /* if (StringUtils.isNotBlank(useOrgSid)) {
             qw.eq("useOrgSid", useOrgSid);
         }*/
-        if(StringUtils.isNotBlank(params.getContractNo())){
-            qw.like("contractNo",params.getContractNo());
+        if (StringUtils.isNotBlank(params.getContractNo())) {
+            qw.like("contractNo", params.getContractNo());
         }
-        if(StringUtils.isNotBlank(params.getCustomerName())){
-            qw.like("customerName",params.getCustomerName());
+        if (StringUtils.isNotBlank(params.getCustomerName())) {
+            qw.like("customerName", params.getCustomerName());
         }
-        if(StringUtils.isNotBlank(params.getPayTypeKey())){
-            qw.eq("payTypeKey",params.getPayTypeKey());
+        if (StringUtils.isNotBlank(params.getPayTypeKey())) {
+            qw.eq("payTypeKey", params.getPayTypeKey());
         }
         IPage<AppHandoverPreparePageVo> iPage = baseMapper.getDeliveryPlanList(page, qw, params.getName());
         for (AppHandoverPreparePageVo record : iPage.getRecords()) {
@@ -256,6 +257,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 手机端-初始化交车准备申请
+     *
      * @param query
      * @return
      */
@@ -273,6 +275,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 修改交车准备 各资料状态修改
+     *
      * @param dto
      * @return
      */
@@ -284,6 +287,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 获取交车准备 发票信息
+     *
      * @param query
      * @return
      */
@@ -300,23 +304,31 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 获取交车准备 合格证信息
+     *
      * @param query
      * @return
      */
     public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
         ResultBean<AppCertificateInfoVo> rb = new ResultBean();
+        //根据sid查询交车准备数据
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
         AppCertificateInfoVo vo = new AppCertificateInfoVo();
-        String vinNo = query.getVin();
+        ResultBean<HandoverCertVo> resultBean = baseVehicleCertificateFeign.getCertificateInfoOne(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getUseOrgSid());
+       /* String vinNo = query.getVin();
         String userSid = query.getUserSid();
         ResultBean<AppHandoverCertificateInfoVo> resultBean = baseVehicleCertificateFeign.getCertificateInfo(vinNo, userSid);
         AppHandoverCertificateInfoVo data = resultBean.getData();
         BeanUtil.copyProperties(data, vo);
-        vo.setVin(vinNo);
+        vo.setVin(vinNo);*/
+        HandoverCertVo handoverCertVo = resultBean.getData();
+        BeanUtil.copyProperties(handoverCertVo, vo);
         return rb.success().setData(vo);
     }
 
     /**
      * 获取交车准备 保单信息
+     *
      * @param query
      * @return
      */
@@ -342,6 +354,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 修改交车准备 保单信息
+     *
      * @param dto
      * @return
      */
@@ -356,6 +369,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 获取交车准备 其他资料信息
+     *
      * @param query
      * @return
      */
@@ -375,12 +389,13 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 修改交车准备 其他资料信息
+     *
      * @param dto
      * @return
      */
     public ResultBean saveOtherDataInfo(AppOtherDataDto dto) {
         ResultBean rb = new ResultBean<>();
-        if(dto.getOtherInfo().isEmpty()){
+        if (dto.getOtherInfo().isEmpty()) {
             return rb.setMsg("其他资料图片为必填项");
         }
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
@@ -390,6 +405,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 保存交车准备信息
+     *
      * @param dto
      * @return
      */
@@ -414,6 +430,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 交车准备详情
+     *
      * @param query
      * @return
      */
@@ -431,6 +448,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
 
     /**
      * 提交交车准备信息
+     *
      * @param dto
      * @return
      */