分页修改1

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

@@ -1,8 +1,12 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Contacts;
 import com.management.platform.entity.Custom;
+import com.management.platform.entity.User;
+import com.management.platform.mapper.ContactsMapper;
+import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ContactsService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +39,12 @@ public class ContactsController {
     @Autowired
     private ContactsService contactsService;
 
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private ContactsMapper contactsMapper;
+
     /**
      * 添加联系人
      * @param contacts
@@ -139,6 +149,16 @@ public class ContactsController {
     }
 
 
+    @RequestMapping("allContacts")
+    public HttpRespMsg allContacts(HttpServletRequest request){
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        msg.setData(
+                contactsMapper.selectList(new QueryWrapper<Contacts>().eq("company_id", user.getCompanyId()))
+        );
+        return msg;
+    }
 
 
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Task.java

@@ -200,6 +200,9 @@ public class Task extends Model<Task> {
     @TableField("finish_date")
     private LocalDateTime finishDate;
 
+    @TableField("taskType")
+    private Integer taskType; //客户0,商机1 ,订单2 线上3
+
     /**
      * 是否被删除: 0否,1是
      */

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

@@ -170,6 +170,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         taskDto.setCompanyId(user.getCompanyId());
         List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new LambdaQueryWrapper<TaskExecutor>().eq(TaskExecutor::getCompanyId,user.getCompanyId()));
         List<TaskLog> taskLogList = taskLogMapper.selectList(new LambdaQueryWrapper<TaskLog>().eq(TaskLog::getCompanyId,user.getCompanyId()));
+        taskDto.setPageIndex((taskDto.getPageIndex()-1)*taskDto.getPageSize());
         List<TasKVo> taskVoList =taskMapper.getPageListTask(taskDto);
         for (TasKVo tasKVo : taskVoList) {
             if (!taskExecutorList.isEmpty()){

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -149,6 +149,7 @@
         <if test="pageIndex != null and pageSize != null">
             LIMIT #{pageIndex}, #{pageSize}
         </if>
+        order by task.create_date desc
 
     </select>