线索通过客户级别排序

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

@@ -212,35 +212,36 @@ public class ClueController {
 
     // 批量放入回收站
     @RequestMapping("delete")
-    public Object delete(Clue clue) {
+    public Object delete(Clue clue,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         String ids1 = clue.getIds();
         List<Integer> ids = new ArrayList<>();
+        User user = userMapper.selectById(request.getHeader("Token"));
         if (!ids1.isEmpty()) {
             for (String id : ids1.split(",")) {
                 ids.add(Integer.parseInt(id));
             }
-            clueService.isDelete(ids);
+            clueService.isDelete(ids,user.getId());
             msg.setMsg("操作成功");
         } else {
             msg.setError("请选择线索");
-
         }
         return msg;
     }
 
     // 批量恢复
     @RequestMapping("rollback")
-    public Object rollback(Clue clue) {
+    public Object rollback(Clue clue,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         msg.setMsg("操作成功");
+        User user = userMapper.selectById(request.getHeader("Token"));
         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);
+            clueService.isRollback(ids,user.getId());
             msg.setMsg("操作成功");
         } else {
             msg.setError("请选择线索");

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

@@ -25,7 +25,7 @@ public interface ClueService extends IService<Clue> {
     void insert(Clue clue);
     void update(Clue clue);
 
-    void isDelete(List<Integer> ids);
+    void isDelete(List<Integer> ids,String userId);
 
     List<Clue> getList(Clue clue);
     List<Clue> getList1(Clue clue, User user);
@@ -35,7 +35,7 @@ public interface ClueService extends IService<Clue> {
 
     Clue getInfo(Clue clue);
 
-    void isRollback(List<Integer> ids);
+    void isRollback(List<Integer> ids,String userId);
 
     void deleterDelete(List<Integer> ids);
 

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

@@ -144,7 +144,15 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void isDelete(List<Integer> ids) {
+    public void isDelete(List<Integer> ids,String userId) {
+        for (Integer id : ids) {
+            ActionLog log = new ActionLog();
+            log.setItemId(id);
+            log.setName("删除了线索");
+            log.setCode("clue");
+            log.setUserId(userId);
+            log.setCreatTime(new Date());
+        }
         UpdateWrapper<Clue> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("id", ids);
         Clue clue = new Clue();
@@ -204,7 +212,16 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void isRollback(List<Integer> ids) {
+    public void isRollback(List<Integer> ids,String userId) {
+        for (Integer id : ids) {
+            ActionLog log = new ActionLog();
+            log.setItemId(id);
+            log.setName("恢复了线索");
+            log.setCode("clue");
+            log.setUserId(userId);
+            log.setCreatTime(new Date());
+        }
+
         UpdateWrapper<Clue> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("id", ids);
         Clue clue = new Clue();
@@ -287,7 +304,6 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
                 File uploadDir = new File(filePath);
                 if (!uploadDir.exists()) {
                     uploadDir.mkdirs();
-
                 }
                 UploadFile uf = new UploadFile();
                 uf.setName(originalFilename);