pc端客户相关问题修复

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeign.java

@@ -48,7 +48,7 @@ public interface CommonAppendixFeign {
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody CommonAppendixDto dto);
-      
+
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
     public ResultBean update(@RequestBody CommonAppendixDto dto, @PathVariable("sid") String sid);
@@ -60,14 +60,14 @@ public interface CommonAppendixFeign {
     @ApiOperation("获取一条记录")
     @GetMapping("/fetch/{id}")
     public ResultBean<CommonAppendixVo> fetch(@PathVariable("id") String id);
-      
+
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<CommonAppendixVo> fetchSid(@PathVariable("sid") String sid);
 
     @ApiOperation("PC端保存/修改附件")
     @PostMapping("/saveOrUpdatePcAppendix")
-    public ResultBean saveOrUpdatePcAppendix(@RequestBody PcCommonAppendixDto dto, @RequestParam("sid") String sid,@RequestParam("staffSid") String staffSid);
+    public ResultBean saveOrUpdatePcAppendix(@RequestBody PcCommonAppendixDto dto, @RequestParam("sid") String sid, @RequestParam("staffSid") String staffSid, @RequestParam("attachType") String attachType);
 
     @ApiOperation("Pc端查询附件")
     @PostMapping("/getPcAppendix")
@@ -90,7 +90,7 @@ public interface CommonAppendixFeign {
     @ApiOperation("手机端查询附件")
     @GetMapping("/getAppAppendix")
     public ResultBean<AppCommonAppendixVo> getAppAppendix(@RequestParam("linkSid") String linkSid,
-                                                                                                            @RequestParam(value = "attachType", required = false) String attachType);
+                                                          @RequestParam(value = "attachType", required = false) String attachType);
 
     @ApiOperation("手机端查询担保人文件附件")
     @GetMapping("/getAppGuarantorList")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAppendixFeignFallback.java

@@ -69,7 +69,7 @@ public class CommonAppendixFeignFallback implements CommonAppendixFeign {
 	}
 
 	@Override
-	public ResultBean saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid,String staffSid) {
+	public ResultBean saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid,String staffSid,String attachType) {
 		return ResultBean.fireFail().setMsg("接口anrui-base/commonappendix/saveOrUpdatePcAppendix无法访问");
 	}
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.base.biz.commonappendix;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.commonappendix.*;
 import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -97,8 +98,10 @@ public class CommonAppendixRest implements CommonAppendixFeign {
 	}
 
 	@Override
-	public ResultBean saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid,String staffSid) {
+	public ResultBean saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid,String staffSid,String attachType) {
-		String attachType = CommonAttachTypeEnum.CONTRACT.getAttachType();
+		if(StringUtils.isBlank(attachType)){
+			attachType = CommonAttachTypeEnum.CONTRACT.getAttachType();
+		}
 		int i = commonAppendixService.saveOrUpdatePcAppendix(dto,sid,staffSid,attachType);
 		if (i == 0) {
 			return new ResultBean().fail().setMsg("保存失败");

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -86,7 +86,7 @@ public interface CrmCustomerTempFeign {
      */
     @ApiOperation("删除记录")
     @DeleteMapping("/del")
-    public ResultBean del(String[] sid);
+    public ResultBean del(@RequestBody String[] sid);
 
     /**
      * pc潜在客户的编辑回显

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.crm.biz.crmvisit;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandVo;
 import com.yxt.anrui.crm.api.crmvisit.*;
@@ -103,7 +104,7 @@ public class CrmVisitRest implements CrmVisitFeign {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String createTime = simpleDateFormat.format(new Date());
                 if (dto.getList().size() != 0) {
-                    commonAppendixFeign.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, staffSid);
+                    commonAppendixFeign.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, staffSid, CommonAttachTypeEnum.WITNESS.getAttachType());
                 }
             }
             //往跟进记录和车型需求关联表中添加
@@ -163,7 +164,7 @@ public class CrmVisitRest implements CrmVisitFeign {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String createTime = simpleDateFormat.format(new Date());
                 if (dto.getList().size() != 0) {
-                    ResultBean resultBean = commonAppendixFeign.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, staffSid);
+                    ResultBean resultBean = commonAppendixFeign.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, staffSid, CommonAttachTypeEnum.WITNESS.getAttachType());
                 }
             }
             return rb.success().setMsg("修改成功");