20210420

tall/src/main/java/com/ccsens/tall/persist/dao/SysOperationDao.java

@@ -47,7 +47,7 @@ public interface SysOperationDao extends SysOperationMapper {
      * @param projectIdList
      * @return
      */
-    List<ProjectMessageVo.ProjectMsg> queryProjectMsg(List<Long> projectIdList);
+    List<ProjectMessageVo.ProjectMsg> queryProjectMsg(@Param("projectIdList") List<Long> projectIdList);
 
     /**
      * 查询任务下的输入输入文档消息id

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common
 

tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml

@@ -65,61 +65,49 @@
         s.end_time as taskEndTime,
         if(a.rId is not null or r.`name` = '全体成员',1,0) as mine
         FROM
-        t_pro_task_detail d LEFT JOIN t_pro_task_sub_time s on d.id = s.task_detail_id
+        t_pro_task_detail d
+        LEFT JOIN t_pro_task_sub_time s on d.id = s.task_detail_id
         LEFT JOIN t_pro_role r on r.id = d.executor_role
         LEFT JOIN
-        (
+            (
-        SELECT
+                SELECT
-        count(m.id) as mid,
+                count(m.id) as mid,
-        s.id as sId
+                s.id as sId
-        FROM
+                FROM
-        t_pro_sub_time_member m LEFT JOIN t_pro_task_sub_time s on m.task_sub_time_id = s.id
+                t_pro_sub_time_member m LEFT JOIN t_pro_task_sub_time s on m.task_sub_time_id = s.id
-        WHERE
+                WHERE
-        m.member_id = #{memberId}
+                m.member_id = #{memberId}
-        and
+                and
-        m.rec_status = 0
+                m.rec_status = 0
-        )t on t.sId = s.id
+            )t on t.sId = s.id
         LEFT JOIN
-        (
+            (
-        SELECT
+                SELECT
-        r.id as rId
+                r.id as rId
-        FROM
+                FROM
-        t_pro_role r Left join t_pro_member_role mr on r.id = mr.role_id
+                t_pro_role r Left join t_pro_member_role mr on r.id = mr.role_id
-        LEFT JOIN t_pro_member m on mr.member_id = m.id
+                LEFT JOIN t_pro_member m on mr.member_id = m.id
-        WHERE
+                WHERE
-        m.user_id = #{userId}
+                m.user_id = #{userId}
-        and m.rec_status = 0
+                and m.rec_status = 0
-        and r.rec_status = 0
+                and r.rec_status = 0
-        ) a on a.rId = r.id
+            ) a on a.rId = r.id
-
         WHERE
         d.project_id = #{projectId}
-        and
+        and d.rec_status = 0
-        d.rec_status = 0
+        and d.level != 0
-        and
+        and d.level != 1
-        d.level != 0
-        and
-        d.level != 1
         <if test="roleId != null">
-        and
+        and r.id = #{roleId}
-        r.id = #{roleId}
         </if>
+        and s.complated_status = #{type}
+        and FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m:%s') &lt; NOW()
         and
-        s.complated_status = #{type}
+            (
-        and
+                ( d.finish_need_all = 0 )
-        FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m:%s') &lt; NOW()
+                or
-        and
+                ( d.finish_need_all = 1 and t.mid > 0 )
-        (
+            )
-        (
-        d.finish_need_all = 0
-        )
-        or
-        (
-        d.finish_need_all = 1
-        and
-        t.mid > 0
-        )
-        )
         ORDER BY
         <if test="orderType == 0">
             s.begin_time DESC
@@ -128,7 +116,6 @@
             d.priority DESC
             ,s.begin_time DESC
         </if>
-
     </select>
 
     <select id="getKanbanTakeByType" parameterType="java.util.Map" resultType="com.ccsens.tall.bean.vo.TaskVo$KanBanTask">