任务

pcbms/src/main/java/com/hssx/pcbms/entity/Task.java

@@ -1,10 +1,9 @@
 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;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import lombok.Data;
@@ -29,13 +28,7 @@ public class Task extends Model<Task> {
     /**
      * 任务主键
      */
-    //AUTO 数据库ID自增
-    //INPUT 用户输入ID
-    //ID_WORKER 全局唯一ID，Long类型的主键
-    //ID_WORKER_STR 字符串全局唯一ID
-    //UUID 全局唯一ID，UUID类型的主键
-    //NONE 该类型为未设置主键类型
-    @TableId(value = "id",type = IdType.ID_WORKER_STR )
+    @TableId("id")
     private String id;
 
     /**
@@ -116,6 +109,12 @@ public class Task extends Model<Task> {
     @TableField("content")
     private String content;
 
+    /**
+     * 排序时间
+     */
+    @TableField("indate")
+    private LocalDateTime indate;
+
 
     @Override
     protected Serializable pkVal() {

pcbms/src/main/java/com/hssx/pcbms/mapper/TaskMapper.java

@@ -20,7 +20,7 @@ public interface TaskMapper extends BaseMapper<Task> {
 
     List<TaskDTO> selectListByCondition(@Param("taskVO") TaskVO taskVO);
 
-    List<TaskDTO> selectListByTaskIds(@Param("list")List<String> taskIds);
+    List<TaskDTO> selectListByTaskIds(@Param("list")List<String> taskIds,@Param("taskVO") TaskVO taskVO);
 
     TaskDTO getDetailById(@Param("taskVO")TaskVO taskVO);
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/TaskServiceImpl.java

@@ -103,7 +103,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 taskIds.addAll(participants.stream().map(TaskParticipants::getTaskId).collect(Collectors.toList()));
             }
             if(taskIds .size()>0){
-                List<TaskDTO> taskDTOList = taskMapper.selectListByTaskIds(taskIds);
+                List<TaskDTO> taskDTOList = taskMapper.selectListByTaskIds(taskIds,taskVO);
                 PageInfo<TaskDTO> pageInfo = new PageInfo<>(taskDTOList);
                 msg.data = pageInfo;
             }

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("task_dynamic");
+        strategy.setInclude("task");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

pcbms/src/main/resources/mapper/TaskMapper.xml

@@ -18,7 +18,9 @@
         <result column="state" property="state" />
         <result column="publish_id" property="publishId" />
         <result column="content" property="content" />
+        <result column="indate" property="indate" />
     </resultMap>
+
     <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.TaskDTO">
         <id column="id" property="id" />
         <result column="name" property="name" />
@@ -37,7 +39,7 @@
         <result column="tag_name" property="tagName" />
         <result column="recipient" property="recipient" />
         <result column="content" property="content" />
-        <collection property="participantsVOS" select="selectPaticaterByTaskId" column="{taskId=id,}"
+        <collection property="participantsVOS" select="selectPaticaterByTaskId" column="id"
                     ofType="com.hssx.pcbms.entity.vo.TaskParticipantsVO"/>
     </resultMap>
 
@@ -49,7 +51,7 @@
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         select
         t.id, t.name, t.code, t.plan_time, t.work_load, t.recipient_id,
-        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id
+        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id,
         u.name publishName,tt.name tag_name,ru.name recipient,t.content
         from
         task t
@@ -72,13 +74,16 @@
             <if test="taskVO.tagId != null and taskVO.tagId != ''">
                 and t.tag_id = #{taskVO.tagId}
             </if>
+            <if test="taskVO.state != null">
+                and t.state = #{taskVO.state}
+            </if>
         </where>
-        order by t.id desc
+        order by t.indate desc
     </select>
     <select id="selectListByTaskIds" resultMap="BaseResultMapVO">
         select
         t.id, t.name, t.code, t.plan_time, t.work_load, t.recipient_id,
-        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id
+        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id,
         u.name publishName,tt.name tag_name,ru.name recipient
         from
         task t
@@ -104,8 +109,11 @@
             <if test="taskVO.tagId != null and taskVO.tagId != ''">
                 and t.tag_id = #{taskVO.tagId}
             </if>
+            <if test="taskVO.state != null">
+                and t.state = #{taskVO.state}
+            </if>
         </where>
-        order by t.id desc
+        order by t.indate desc
     </select>
     <resultMap id="PaticaterMapVO" type="com.hssx.pcbms.entity.vo.TaskParticipantsVO">
         <id column="id" property="id" />
@@ -122,11 +130,11 @@
           on tp.user_id = u.id
           where tp.task_id = #{id}
     </select>
-    
+
     <select id="getDetailById" resultMap="BaseResultMapVO">
         select
         t.id, t.name, t.code, t.plan_time, t.work_load, t.recipient_id,
-        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id
+        t.payer, t.payee, t.fee, t.tag_id, t.delay_time, t.state, t.publish_id,
         u.name publishName,tt.name tag_name,ru.name recipient,t.content
         from
         task t