线索

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -151,6 +151,7 @@ public class ClueController {
     }
 
 
+    //放入回收站
     @RequestMapping("delete")
     public Object delete(Clue clue) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -170,15 +171,26 @@ public class ClueController {
     }
 
     @RequestMapping("rollback")
-    public Object rollback(@RequestBody List<Integer> ids) {
+    public Object rollback(Clue clue) {
         HttpRespMsg msg = new HttpRespMsg();
         msg.setMsg("操作成功");
-        clueService.isRollback(ids);
+        String ids1 = clue.getIds();
+        List<Integer> ids = new ArrayList<>();
+        if (!ids1.isEmpty()) {
+            for (String id : ids1.split(",")) {
+                ids.add(Integer.parseInt(id));
+            }
+            clueService.isRollback(ids);
+            msg.setMsg("操作成功");
+        }else {
+            msg.setError("请选择线索");
+
+        }
         return msg;
     }
 
     @RequestMapping("claim")
-    public Object claim(@RequestBody Clue clue, HttpServletRequest request) {
+    public Object claim( Clue clue, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("Token"));
         HttpRespMsg msg = new HttpRespMsg();
         msg.setMsg("操作成功");

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -230,7 +230,7 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
 
         clue.setCompanyId(user.getCompanyId());
 
-        String fileName="任务表导出_"+ System.currentTimeMillis();
+        String fileName="线索表导出_"+ System.currentTimeMillis();
         return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName,dataList,path);
     }