修改1

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

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  * @since 2021-04-19
  */
 @RestController
-@RequestMapping("/task")
+@RequestMapping("/tasks")
 public class TaskController {
     @Resource
     private HttpServletRequest request;
@@ -68,8 +68,15 @@ public class TaskController {
     }
 
     @RequestMapping("deleteTasks")
-    public HttpRespMsg deleteTasks(List<Integer> taskIds){
-        return taskService.deleteTasks(taskIds);
+    public HttpRespMsg deleteTasks(String taskIds){
+        List<Integer> ids=new ArrayList<>();
+        if (!StringUtils.isEmpty(taskIds)){
+            String[] split = taskIds.split(",");
+            for (int i = 0; i < split.length; i++) {
+                ids.add(Integer.valueOf(split[i]));
+            }
+        }
+        return taskService.deleteTasks(ids);
     }
 
     @RequestMapping("importData")

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

@@ -20,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2024-04-10
+ * @since 2024-04-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -200,8 +200,6 @@ public class Task extends Model<Task> {
     @TableField("finish_date")
     private LocalDateTime finishDate;
 
-    @TableField("task_type")
-    private Integer taskType; //客户0,商机1 ,订单2 线上3
 
     /**
      * 是否被删除: 0否,1是
@@ -209,6 +207,12 @@ public class Task extends Model<Task> {
     @TableField("is_delete")
     private Integer isDelete;
 
+    /**
+     * 客户0, 商机1 ,订单2 , 线索3
+     */
+    @TableField("task_type")
+    private Integer taskType;
+
     /**
      * 自定义字段存值
      */

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

@@ -258,9 +258,13 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
     @Transactional(rollbackFor = Exception.class)
     public HttpRespMsg deleteTasks(List<Integer> taskIds) {
         HttpRespMsg msg = new HttpRespMsg();
+        if (taskIds.isEmpty()){
+            msg.setError("请传递关键信息");
+            return msg;
+        }
         List<Task> taskList = taskMapper.selectList(new QueryWrapper<Task>().in("id", taskIds));
         if (!taskList.isEmpty()){
-            List<Task> collect = taskList.stream().filter(task -> task.getStatus() != 2).collect(Collectors.toList());
+            List<Task> collect = taskList.stream().filter(task ->task.getStatus()!=0&& task.getStatus() != 2).collect(Collectors.toList());
             if (collect.size()>0){
                 msg.setError("存在任务未完成,不能删除");
             }

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

@@ -32,6 +32,7 @@
         <result column="start_date" property="startDate" />
         <result column="finish_date" property="finishDate" />
         <result column="is_delete" property="isDelete" />
+        <result column="task_type" property="taskType" />
         <result column="plate1" property="plate1" />
         <result column="plate2" property="plate2" />
         <result column="plate3" property="plate3" />
@@ -41,7 +42,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, task_name, company_id, owner_id, contacts_id, executor_id, clue_id, custom_id, business_opportunity_id, order_id, product_id, status, priority, is_repeat, repeat_type, repeat_end_never, repeat_end_count, repeat_end_date, repeat_design_day, repeat_design_sameday, task_desc, creater_id, creater_name, create_date, end_date, start_date, finish_date, is_delete, plate1, plate2, plate3, plate4, plate5
+        id, task_name, company_id, owner_id, contacts_id, executor_id, clue_id, custom_id, business_opportunity_id, order_id, product_id, status, priority, is_repeat, repeat_type, repeat_end_never, repeat_end_count, repeat_end_date, repeat_design_day, repeat_design_sameday, task_desc, creater_id, creater_name, create_date, end_date, start_date, finish_date, is_delete,task_type, plate1, plate2, plate3, plate4, plate5
     </sql>
 
     <resultMap id="TaskVoMap" type="com.management.platform.entity.vo.TasKVo">
@@ -73,6 +74,7 @@
         <result column="start_date" property="startDate" />
         <result column="finish_date" property="finishDate" />
         <result column="is_delete" property="isDelete" />
+        <result column="task_type" property="taskType" />
         <result column="plate1" property="plate1" />
         <result column="plate2" property="plate2" />
         <result column="plate3" property="plate3" />
@@ -145,11 +147,12 @@
             </if>
 
         </where>
+        order by task.create_date desc
 
         <if test="pageIndex != null and pageSize != null">
             LIMIT #{pageIndex}, #{pageSize}
         </if>
-        order by task.create_date desc
+
 
     </select>