Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -185,4 +185,6 @@ public class BaseVehicle extends BaseEntity {
     private String orgPriceDate;
     @ApiModelProperty(value = "组织全路径")
     private String orgSidPath;
+    @ApiModelProperty("厂家开票日期")
+    private String manDate;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -528,4 +528,9 @@ public interface BaseVehicleFeign {
     @PostMapping("/fetchBySid")
     @ResponseBody
     ResultBean<BaseVehicle> fetchBySid(@RequestParam("vinSid") String vinSid);
+
+    @ApiOperation("设置厂家开票日期")
+    @PostMapping("/setManDate")
+    @ResponseBody
+    ResultBean setManDate(@RequestBody ManDateQuery manDateQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -427,6 +427,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean setManDate(ManDateQuery manDateQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/ManDateQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/12/19
+ **/
+@Data
+public class ManDateQuery implements Query {
+    private static final long serialVersionUID = 5859730786367349160L;
+
+
+    private List<String> vinSids = new ArrayList<>();
+
+    private String manDate;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -1501,6 +1501,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(baseVehicle);
     }
 
+    @Override
+    public ResultBean setManDate(ManDateQuery manDateQuery) {
+        return baseVehicleService.setManDate(manDateQuery);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -4369,4 +4369,21 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return rb.success();
     }
+
+    public ResultBean setManDate(ManDateQuery manDateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> vinSids = manDateQuery.getVinSids();
+        vinSids.removeAll(Collections.singleton(null));
+        if(vinSids.isEmpty()){
+            return rb.setMsg("请选择车辆");
+        }
+        for (int i = 0; i < vinSids.size(); i++) {
+            BaseVehicle baseVehicle = fetchBySid(vinSids.get(i));
+            if(baseVehicle != null){
+                baseVehicle.setManDate(manDateQuery.getManDate());
+                baseMapper.updateById(baseVehicle);
+            }
+        }
+        return rb.success();
+    }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java

@@ -26,11 +26,15 @@
 package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
 
 
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-riskcenter(家访考察) <br/>
  * File: LoanHomevisitInvestigateOtherpeoVo.java <br/>
@@ -48,6 +52,8 @@ import lombok.Data;
 @ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情")
 public class LoanBeCollectionVehDbrDetailsVo implements Vo {
 
+    private String sid;
+
     @ApiModelProperty("人员身份key")
     private String peoTypeKey;
 	@ApiModelProperty("人员身份")
@@ -68,5 +74,14 @@ public class LoanBeCollectionVehDbrDetailsVo implements Vo {
     private String peoCareerKey; // 职业key
 	@ApiModelProperty("职业value")
     private String peoCareerValue; // 职业value
-
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid; // 家访考察表sid
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
+    @ApiModelProperty("身份证附件")
+    private List<LoanBeCollectionFileVo> sfzFiles = new ArrayList<>();
+    @ApiModelProperty("担保协议")
+    private List<LoanBeCollectionFileVo> dbxyFiles = new ArrayList<>();
+    @ApiModelProperty("其他")
+    private List<LoanBeCollectionFileVo> qtFiles = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDto.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
+import com.yxt.common.core.dto.Dto;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(家访考察) <br/>
+ * File: LoanHomevisitInvestigateOtherpeoVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo <br/>
+ * Description: 家访考察-其他人员 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-10 15:13:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情")
+public class LoanBeCollectionVehDbrDto implements Dto {
+
+    private String sid;
+
+    @ApiModelProperty("人员身份key")
+    private String peoTypeKey;
+	@ApiModelProperty("人员身份")
+    private String peoType; // 人员身份
+	@ApiModelProperty("姓名")
+    private String peoName; // 姓名
+	@ApiModelProperty("身份证号")
+    private String idNumber; // 身份证号
+	@ApiModelProperty("手机号")
+    private String mobile; // 手机号
+	@ApiModelProperty("户籍地址")
+    private String peoDomAddress; // 户籍地址
+	@ApiModelProperty("现住址")
+    private String peoPreAddress; // 现住址
+	@ApiModelProperty("工作单位")
+    private String workUnit; // 工作单位
+	@ApiModelProperty("职业key")
+    private String peoCareerKey; // 职业key
+	@ApiModelProperty("职业value")
+    private String peoCareerValue; // 职业value
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid; // 家访考察表sid
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
+    @ApiModelProperty("身份证附件")
+    private List<LoanBeCollectionFileVo> sfzFiles = new ArrayList<>();
+    @ApiModelProperty("担保协议")
+    private List<LoanBeCollectionFileVo> dbxyFiles = new ArrayList<>();
+    @ApiModelProperty("其他")
+    private List<LoanBeCollectionFileVo> qtFiles = new ArrayList<>();
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java

@@ -86,5 +86,5 @@ public interface LoanBeCollectionVehFeign {
     @ApiOperation("增加担保人")
     @PostMapping("/saveDbr")
     @ResponseBody
-    public ResultBean saveDbr(@RequestBody LoanBeCollectionApplyDto dto);
+    public ResultBean saveDbr(@RequestBody LoanBeCollectionVehDbrDto dto);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java

@@ -77,7 +77,7 @@ public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeig
 	}
 
 	@Override
-	public ResultBean saveDbr(LoanBeCollectionApplyDto dto) {
+	public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
 		return null;
 	}
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanAttachTypeEnum.java

@@ -31,6 +31,8 @@ public enum LoanAttachTypeEnum {
     BD("022", "保单"),
     RZHT("023", "融资合同"),
     ZMFJ("024", "证明附件"),
+    DBRDBXY("025", "担保人担保协议"),
+    DBRQT("026", "担保人其他"),
     ;
 
     /**

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeo.java

@@ -72,6 +72,6 @@ public class LoanHomevisitInvestigateOtherpeo extends BaseEntity {
     private String peoCareerValue; // 职业value
 	@ApiModelProperty("家访考察表sid")
     private String mainSid; // 家访考察表sid
-/*    @ApiModelProperty("销售订单车辆sid")
+    @ApiModelProperty("销售订单车辆sid")
-    private String mainSid;*/
+    private String saleVehSid;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoDetailsVo.java

@@ -73,5 +73,6 @@ public class LoanHomevisitInvestigateOtherpeoDetailsVo implements Vo {
     private String peoCareerValue; // 职业value
 	@ApiModelProperty("家访考察表sid")
     private String mainSid; // 家访考察表sid
-
+    @ApiModelProperty("销售订单车辆sid")
+    private String saleVehSid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java

@@ -102,7 +102,9 @@ public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign {
 	}
 
 	@Override
-	public ResultBean saveDbr(LoanBeCollectionApplyDto dto) {
+	public ResultBean saveDbr(LoanBeCollectionVehDbrDto dto) {
-		return null;
+		ResultBean rb = ResultBean.fireFail();
+		loanBeCollectionVehService.saveDbr(dto);
+		return rb.success();
 	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java

@@ -30,10 +30,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.*;
+import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFile;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService;
 import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -44,6 +53,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -68,6 +78,10 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
     @Autowired
     private LoanHomevisitInvestigateOtherpeoService loanHomevisitInvestigateOtherpeoService;
+    @Autowired
+    private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     private QueryWrapper<LoanBeCollectionVeh> createQueryWrapper(LoanBeCollectionVehQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -138,6 +152,106 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
         LoanHomevisitInvestigateOtherpeoDetailsVo loanHomevisitInvestigateOtherpeoDetailsVo = loanHomevisitInvestigateOtherpeoService.selByMainSidAndSaleVehSid(sid, saleVehSid);
         LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = new LoanBeCollectionVehDbrDetailsVo();
         BeanUtil.copyProperties(loanHomevisitInvestigateOtherpeoDetailsVo, loanBeCollectionVehDbrDetailsVo);
+        loanBeCollectionVehDbrDetailsVo.setSaleVehSid(saleVehSid);
+        loanBeCollectionVehDbrDetailsVo.setMainSid(sid);
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzs = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+        List<LoanBeCollectionFileVo> sfzs = new ArrayList<>();
+        if (dbrsfzs != null && dbrsfzs.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dbrsfz : dbrsfzs) {
+                LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo();
+                String fileUrl = dbrsfz.getFileUrl();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                fileUrl = urlPrefix + fileUrl;
+                loanBeCollectionFileVo.setUrl(fileUrl);
+                sfzs.add(loanBeCollectionFileVo);
+            }
+        }
+        loanBeCollectionVehDbrDetailsVo.setSfzFiles(sfzs);
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrdbxys = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRDBXY.getAttachType());
+        List<LoanBeCollectionFileVo> dbxys = new ArrayList<>();
+        if (dbrdbxys != null && dbrdbxys.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dbxy : dbrdbxys) {
+                LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo();
+                String fileUrl = dbxy.getFileUrl();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                fileUrl = urlPrefix + fileUrl;
+                loanBeCollectionFileVo.setUrl(fileUrl);
+                dbxys.add(loanBeCollectionFileVo);
+            }
+        }
+        loanBeCollectionVehDbrDetailsVo.setDbxyFiles(dbxys);
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrqts = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRQT.getAttachType());
+        List<LoanBeCollectionFileVo> qts = new ArrayList<>();
+        if (dbrqts != null && dbrqts.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo qt : dbrqts) {
+                LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo();
+                String fileUrl = qt.getFileUrl();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                fileUrl = urlPrefix + fileUrl;
+                loanBeCollectionFileVo.setUrl(fileUrl);
+                qts.add(loanBeCollectionFileVo);
+            }
+        }
+        loanBeCollectionVehDbrDetailsVo.setQtFiles(qts);
         return loanBeCollectionVehDbrDetailsVo;
     }
+
+    public void saveDbr(LoanBeCollectionVehDbrDto dto) {
+        LoanHomevisitInvestigateOtherpeo loanHomevisitInvestigateOtherpeo = new LoanHomevisitInvestigateOtherpeo();
+        loanHomevisitInvestigateOtherpeo.setPeoTypeKey("1");
+        loanHomevisitInvestigateOtherpeo.setPeoType("担保人");
+        loanHomevisitInvestigateOtherpeo.setPeoName(dto.getPeoName());
+        loanHomevisitInvestigateOtherpeo.setIdNumber(dto.getIdNumber());
+        loanHomevisitInvestigateOtherpeo.setMobile(dto.getMobile());
+        loanHomevisitInvestigateOtherpeo.setPeoDomAddress(dto.getPeoDomAddress());
+        loanHomevisitInvestigateOtherpeo.setPeoPreAddress(dto.getPeoPreAddress());
+        loanHomevisitInvestigateOtherpeo.setWorkUnit(dto.getWorkUnit());
+        loanHomevisitInvestigateOtherpeo.setPeoCareerKey(dto.getPeoCareerKey());
+        loanHomevisitInvestigateOtherpeo.setPeoCareerValue(dto.getPeoCareerValue());
+        loanHomevisitInvestigateOtherpeo.setMainSid(dto.getMainSid());
+        loanHomevisitInvestigateOtherpeo.setSaleVehSid(dto.getSaleVehSid());
+        List<LoanBeCollectionFileVo> sfzFiles = dto.getSfzFiles();
+        if (sfzFiles != null && sfzFiles.size() > 0){
+            for (LoanBeCollectionFileVo sfzFile : sfzFiles) {
+                String url = sfzFile.getUrl();
+                if (url.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    url = url.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType());
+                loanHomevisitInvestigateFileDto.setFileUrl(url);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+        }
+        List<LoanBeCollectionFileVo> dbxyFiles = dto.getDbxyFiles();
+        if (dbxyFiles != null && dbxyFiles.size() > 0){
+            for (LoanBeCollectionFileVo dbxyFile : dbxyFiles) {
+                String url = dbxyFile.getUrl();
+                if (url.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    url = url.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRDBXY.getAttachType());
+                loanHomevisitInvestigateFileDto.setFileUrl(url);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+        }
+        List<LoanBeCollectionFileVo> qtFiles = dto.getQtFiles();
+        if (qtFiles != null && qtFiles.size() > 0){
+            for (LoanBeCollectionFileVo qtFile : qtFiles) {
+                String url = qtFile.getUrl();
+                if (url.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    url = url.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
+                loanHomevisitInvestigateFileDto.setMainSid(dto.getMainSid());
+                loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRQT.getAttachType());
+                loanHomevisitInvestigateFileDto.setFileUrl(url);
+                loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+            }
+        }
+        loanHomevisitInvestigateOtherpeoService.save(loanHomevisitInvestigateOtherpeo);
+    }
 }

anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js

@@ -193,12 +193,22 @@ export function save(data) {
 // 车辆台账--修改备注
 export function updateVehRemarks(data) {
   return request({
-    url: 'base/v1/basevehicle/updateVehRemarks',
+    url: '/base/v1/basevehicle/updateVehRemarks',
     method: 'post',
     params: data
   })
 }
 
+// 车辆台账--设置厂家开票日期
+export function setManDate(data) {
+  return request({
+    url: '/base/v1/basevehicle/setManDate',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
 // 获取厂家销售通路
 export function actualList(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -455,6 +455,7 @@
         </el-carousel>
       </div>
     </el-dialog>
+    <!-- 修改备注 -->
     <el-dialog :visible.sync="dialogRemarks" width="50%" :close-on-click-modal="false">
       <el-form :model="textMap" class="formadd">
         <el-row style="border-top: 1px solid #E0E3EB">
@@ -473,11 +474,30 @@
         <el-button size="small" @click="handleQuXiao">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 设置厂家开票日期 -->
+    <el-dialog title="设置厂家开票日期" :visible.sync="dialogDate" width="50%" :close-on-click-modal="false">
+      <el-form :model="dateMap" class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="4" class="tleftb">
+            <span>日期</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-date-picker value-format="yyyy-MM-dd" v-model="dateMap.manDate" clearable  type="date" placeholder="开始日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="handleDateConfirm">确 定</el-button>
+        <el-button size="small" @click="handleDateQuXiao">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { basefinbankExportExcel, deleteBySids, pagerList, selectCarTransferListAll, updateVehRemarks } from '@/api/cheliang/basevehicle'
+import { basefinbankExportExcel, deleteBySids, pagerList, selectCarTransferListAll, updateVehRemarks, setManDate } from '@/api/cheliang/basevehicle'
 import { typeValues, brandDown, getOrgSidByPath, fetchByUseOrgSid, getButtonPermissions } from '@/api/cheliang/dictcommons'
 import cheliangtaizhangAdd from './cheliangtaizhangAdd'
 import Pagination from '@/components/pagination'
@@ -510,6 +530,7 @@ export default {
       isSearchShow: false,
       dialogVisible: false,
       dialogRemarks: false,
+      dialogDate: false,
       index: 0,
       activeNames: ['3'],
       searchxianshitit: '显示查询条件',
@@ -544,6 +565,13 @@ export default {
           btnKey: 'doChuku',
           btnLabel: '出库'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'setDate',
+          btnLabel: '设置厂家开票日期'
+        },
         {
           type: 'primary',
           size: 'small',
@@ -672,6 +700,10 @@ export default {
         sid: '',
         remarks: ''
       },
+      dateMap: {
+        vinSids: [],
+        manDate: ''
+      },
       multipleSelection: [],
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
@@ -783,6 +815,9 @@ export default {
         case 'doChuku':
           this.doChuku()
           break
+        case 'setDate':
+          this.setDate()
+          break
         case 'doMaiduan':
           this.doMaiduan()
           break
@@ -1146,10 +1181,12 @@ export default {
     handleSelectionChange(row) {
       this.multipleSelection = row
       const aa = []
+      const bb = []
       row.forEach((element) => {
         aa.push(element.sid)
       })
       this.sids = aa
+      this.dateMap.vinSids = aa
     },
     // 打开添加
     toAdd() {
@@ -1181,6 +1218,34 @@ export default {
         this.$refs['divChu'].showChu(this.multipleSelection, this.listQuery.params.createOrgSid)
       }
     },
+    // 设置厂家开票日期
+    setDate() {
+      if (this.dateMap.vinSids.length > 0) {
+        this.dialogDate = true
+      } else {
+        this.$message({ showClose: true, message: '请选择车辆进行设置', type: 'error' })
+      }
+    },
+    handleDateConfirm() {
+      if (this.dateMap.manDate !== '') {
+        setManDate(this.dateMap).then((resp) => {
+          if (resp.success) {
+            this.$message({ showClose: true, type: 'success', message: '设置成功' })
+            this.handleDateQuXiao()
+            this.getList()
+          }
+        })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '日期不能为空' })
+      }
+    },
+    handleDateQuXiao() {
+      this.dateMap = {
+        vinSids: [],
+        manDate: ''
+      }
+      this.dialogDate = false
+    },
     // 买断
     doMaiduan() {
       if (this.sids.length > 0) {