5 år sedan
förälder
incheckning
5d5e31ed49

+ 1 - 0
pcbms/src/main/java/com/hssx/pcbms/constant/Constant.java

@@ -18,6 +18,7 @@ public class Constant {
     public static final String EXAMINE_PASS= "审核通过,任务已完成";
     public static final String EXAMINE_NO_PASS= "审核未通过";
     public static final String EXAMINE_SUBMIT= "已提交任务";
+    public static final String TASK_DELAY= "将任务延期至";
     public static final String TASK_COMPLETED= "已完成";
     public static final String TASK_NO_PASS= "未通过";
     public static final String TASK_PULISH= "发布任务";

+ 9 - 1
pcbms/src/main/java/com/hssx/pcbms/entity/Task.java

@@ -1,6 +1,8 @@
 package com.hssx.pcbms.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -28,7 +30,13 @@ public class Task extends Model<Task> {
     /**
      * 任务主键
      */
-    @TableId("id")
+    //AUTO 数据库ID自增
+    //INPUT 用户输入ID
+    //ID_WORKER 全局唯一ID,Long类型的主键
+    //ID_WORKER_STR 字符串全局唯一ID
+    //UUID 全局唯一ID,UUID类型的主键
+    //NONE 该类型为未设置主键类型
+    @TableId(value = "id",type = IdType.ID_WORKER_STR )
     private String id;
 
     /**

+ 8 - 3
pcbms/src/main/java/com/hssx/pcbms/service/impl/TaskServiceImpl.java

@@ -67,9 +67,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 taskParticipantsService.saveBatch(taskParticipants);
             }
         }else{
-//            if(task.getDelayTime()){
-//
-//            }
+            if(task.getDelayTime()!=null){
+                //添加动态
+                TaskDynamic taskDynamic = new TaskDynamic();
+                taskDynamic.setTaskId(task.getId());
+                taskDynamic.setTaskState(6);//已延期
+                taskDynamic.setStateContent(userMapper.selectById(task.getPublishId()).getName()+Constant.TASK_DELAY+task.getDelayTime());
+                taskDynamicMapper.insert(taskDynamic);
+            }
             taskMapper.updateById(task);
 
             if(participantsIdes.length()>0 && participantsIdes != ""){