修改客户档案和客户基础信息接口

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java

@@ -85,16 +85,16 @@ public interface CrmCustomerFileFeign {
     public ResultBean<CrmCustomerFileListVo> fetchFileListBySid(@PathVariable("sid") String sid);
 
 
-    @ApiOperation("初始化客户档案")
+//    @ApiOperation("初始化客户档案")
-    @ResponseBody
+//    @ResponseBody
-    @GetMapping("/initCustomerArchives/{customerSid}/{userSid}")
+//    @GetMapping("/initCustomerArchives/{customerSid}/{userSid}")
-    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid);
+//    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid);
 
 
-    @ApiOperation("手机端保存客户档案")
+//    @ApiOperation("手机端保存客户档案")
-    @ResponseBody
+//    @ResponseBody
-    @PutMapping("/saveCustomerArchives")
+//    @PutMapping("/saveCustomerArchives")
-    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto);
+//    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto);
 
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java

@@ -65,13 +65,13 @@ public class CrmCustomerFileFeignFallback implements CrmCustomerFileFeign {
 		return null;
 	}
 
-	@Override
+//	@Override
-	public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+//	public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
-		return null;
+//		return null;
-	}
+//	}
 
-	@Override
+//	@Override
-	public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+//	public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
-		return null;
+//		return null;
-	}
+//	}
 }

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.crm.api.crmcustomertemp;
 
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -130,6 +132,17 @@ public interface CrmCustomerTempFeign {
     @ApiOperation("手机端-获取客户基础信息（新）")
     @ResponseBody
     @GetMapping("/customerTempDetailsBySid/{sid}")
-    public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySid(@RequestParam("sid") String sid);
+    public ResultBean<AppCrmCustomerTempBasicsDetailsVo> customerTempDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("初始化客户档案")
+    @ResponseBody
+    @GetMapping("/initCustomerArchives/{customerSid}/{userSid}")
+    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid);
+
+    @ApiOperation("手机端保存客户档案")
+    @ResponseBody
+    @PutMapping("/saveCustomerArchives")
+    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto);
+
 
 }

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.crm.api.crmcustomertemp;
 
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -98,5 +100,15 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml

@@ -23,13 +23,11 @@
     <select id="selectByCustomerSid"
             resultType="com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataVo">
         SELECT ccf.sid,
-               ccf.dataType AS KEY,
+               ccf.dataType                                                            AS `key`,
-	        ccf.fileName AS title,
+               ccf.fileName                                                            AS title,
-	        ( SELECT MAX( cf.`createTime` ) FROM crm_file cf WHERE cf.linkSid = ccf.`sid` ) AS createTime
+               (SELECT MAX(cf.createTime) FROM crm_file cf WHERE cf.linkSid = ccf.sid) AS createTime
-        FROM
+        FROM crm_customer_file ccf
-            crm_customer_file ccf
+        WHERE ccf.linkSid = #{customerSid}
-        WHERE
-            ccf.linkSid = #{customerSid}
     </select>
     <select id="selArchivesFileImageBySid" resultType="com.yxt.anrui.crm.api.crmfile.CrmFile">
         select *

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileRest.java

@@ -77,13 +77,13 @@ public class CrmCustomerFileRest implements CrmCustomerFileFeign {
         return crmCustomerFileService.fetchFileListBySid(sid);
     }
 
-    @Override
+//    @Override
-    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+//    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
-        return crmCustomerFileService.initCustomerArchives(customerSid,userSid);
+//        return crmCustomerFileService.initCustomerArchives(customerSid,userSid);
-    }
+//    }
 
-    @Override
+//    @Override
-    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+//    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
-        return crmCustomerFileService.saveCustomerArchives(dto);
+//        return crmCustomerFileService.saveCustomerArchives(dto);
-    }
+//    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -2,7 +2,10 @@ package com.yxt.anrui.crm.biz.crmcustomertemp;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
+import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.*;
+import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -43,6 +46,9 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
     @Autowired
     private BusDepositFeign busDepositFeign;
 
+    @Autowired
+    private CrmCustomerFileService crmCustomerFileService;
+
     @Autowired
     private SysUserFeign sysUserFeign;
 
@@ -213,4 +219,26 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return new ResultBean<AppCrmCustomerTempBasicsDetailsVo>().success().setData(vo);
     }
 
+    /**
+     * 初始化客户档案信息
+     * @param customerSid
+     * @param userSid
+     * @return
+     */
+    @Override
+    public ResultBean<AppCrmCustomerTempArchivesVo> initCustomerArchives(String customerSid, String userSid) {
+        return crmCustomerFileService.initCustomerArchives(customerSid,userSid);
+    }
+
+    /**
+     * 保存客户档案信息
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) {
+        return crmCustomerFileService.saveCustomerArchives(dto);
+    }
+
+
 }