新建比赛分支

src/main/java/com/ccsens/ptccsens/persist/dao/ProTaskDetailDao.java

@@ -105,7 +105,7 @@ public interface ProTaskDetailDao extends ProTaskDetailMapper {
      * @param roleId 角色id
      * @return 返回任务列表
      */
-    List<TallTaskVo.QueryTask> pageQueryRegularTask(@Param("roleId")Long roleId, @Param("timeNode")Long timeNode, @Param("timeUnit")int timeUnit, @Param("queryType")int queryType, @Param("taskId")Long taskId, @Param("triggerType")int triggerType);
+    List<TallTaskVo.QueryTask> pageQueryRegularTask(@Param("isPm")int isPm, @Param("projectId")Long projectId,@Param("roleId")Long roleId, @Param("timeNode")Long timeNode, @Param("timeUnit")int timeUnit, @Param("queryType")int queryType, @Param("taskId")Long taskId, @Param("triggerType")int triggerType);
 
     /**
      * 通过分解任务id查找任务关联的交付物插件id

src/main/java/com/ccsens/ptccsens/persist/dao/ProTaskSubDao.java

@@ -50,4 +50,6 @@ public interface ProTaskSubDao extends ProTaskSubMapper {
     Long getTimeByProgressTask(@Param("timeNode")Long timeNode, @Param("roleId")Long roleId);
 
     void insertReplace(ProTaskSub taskSub);
+
+    Long getTimeByProgressTaskAndRoleList(@Param("timeNode")Long timeNode, @Param("roleList")List<Long> roleList);
 }

src/main/java/com/ccsens/ptccsens/service/TallService.java

@@ -692,10 +692,15 @@ public class TallService implements ITallService {
                 }
             }
         }
-
+//如果查看的角色项目经理，则查看所有任务
+        int isPm = 0;
+        ProRole role = proRoleDao.selectByPrimaryKey(param.getRoleId());
+        if(ObjectUtil.isNotNull(role)){
+            isPm = role.getLabelId().equals(Constant.PM_LABEL_ID) ? 1 : 0;
+        }
         //获取任务列表
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
-        List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType(),param.getTaskId(),param.getTriggerType());
+        List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(isPm, role.getProjectId(), param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType(),param.getTaskId(),param.getTriggerType());
         PageInfo<TallTaskVo.QueryTask> queryTaskPageInfo = new PageInfo<>(regularTask);
         if(CollectionUtil.isNotEmpty(queryTaskPageInfo.getList())){
             if(param.getQueryType() == 0){
@@ -713,6 +718,26 @@ public class TallService implements ITallService {
             //TODO 查询插件展示信息
             queryPluginShow(queryTaskPageInfo.getList(),user == null ? null : user.getId());
         }
+//        //获取任务列表
+//        PageHelper.startPage(param.getPageNum(),param.getPageSize());
+//        List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType(),param.getTaskId(),param.getTriggerType());
+//        PageInfo<TallTaskVo.QueryTask> queryTaskPageInfo = new PageInfo<>(regularTask);
+//        if(CollectionUtil.isNotEmpty(queryTaskPageInfo.getList())){
+//            if(param.getQueryType() == 0){
+//                //向上查找任务顺序是倒的，需要改成正序
+//                List<TallTaskVo.QueryTask> taskList = new ArrayList<>();
+//                for (int i = queryTaskPageInfo.getList().size() - 1; i >= 0; i--) {
+//                    taskList.add(queryTaskPageInfo.getList().get(i));
+//                }
+//                queryTaskPageInfo.setList(taskList);
+//            }
+//            //查询任务下的插件
+//            queryPluginForTask(queryTaskPageInfo.getList());
+//            //查询任务下的检查人
+//            queryCheckerOfTask(queryTaskPageInfo.getList());
+//            //TODO 查询插件展示信息
+//            queryPluginShow(queryTaskPageInfo.getList(),user == null ? null : user.getId());
+//        }
 
         return queryTaskPageInfo;
     }
@@ -727,11 +752,20 @@ public class TallService implements ITallService {
         }
         //查找用户所属的成员，查找所属的角色
         List<Long> roleList = roleDao.allRoleByUserId(user.getId());
+
+        //根据时间基准线查询当前正在进行的任务（如果多个则选择时间最早的一个）
+        Long queryTime = param.getTimeNode();
+//        if(CollectionUtil.isNotEmpty(roleList)) {
+//            Long startTime = proTaskSubDao.getTimeByProgressTaskAndRoleList(param.getTimeNode(), roleList);
+//            if (ObjectUtil.isNotNull(startTime)) {
+//                queryTime = startTime;
+//            }
+//        }
         if(CollectionUtil.isNotEmpty(roleList)){
             //通过角色和时间等信息，查找任务，如果传入的参数有任务id且code符合当前服务，则排除该任务
             String taskId = Constant.BUSINESS_CODE.equals(param.getBusinessCode()) ? param.getTaskId() : null;
             PageHelper.startPage(param.getPageNum(),param.getPageSize());
-            queryTaskList = taskDetailDao.getAllTaskByRoleList(roleList,param.getTimeNode(),param.getTimeUnit(),param.getQueryType(),taskId);
+            queryTaskList = taskDetailDao.getAllTaskByRoleList(roleList,queryTime,param.getTimeUnit(),param.getQueryType(),taskId);
         }
 
         return queryTaskList;

src/main/java/com/ccsens/ptccsens/util/Constant.java

@@ -16,7 +16,8 @@ public  class Constant {
     public static String BUSINESS_CODE = "PT";
     /**财务条插件名称*/
     public static String PLUGIN_FINANCE = "MP-TALL财务条";
-
+    /**项目经理的标签id*/
+    public static Long PM_LABEL_ID = 34L;
     public static Map<Integer, String> timeUnit = new HashMap<>();
     public static Map<Integer, String> timeFormat = new HashMap<>();
     static {

src/main/resources/application-dev.yml

@@ -1,10 +1,10 @@
 server:
-  port: 7320
+  port: 7330
   servlet:
     context-path: /v1.0
 spring:
   application:
-    name: ptccsens
+    name: ptcontest
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
 #  rabbitmq:
@@ -44,8 +44,8 @@ mybatisCache:
   port: 6379
   timeout: 1000
 
-notGatewayUrl: http://101.201.226.163:7320/v1.0
+notGatewayUrl: http://101.201.226.163:7330/v1.0
 file:
-  path: /home/pt_ccsens/server/uploads/
+  path: /home/pt_contest/server/uploads/
-  domain: https://test.tall.wiki/gateway/ptccsens
+  domain: https://test.tall.wiki/gateway/ptcontest
-  imgDomain: http://101.201.226.163:7320/v1.0/uploads
+  imgDomain: http://101.201.226.163:7330/v1.0/uploads

src/main/resources/application-prod.yml

@@ -1,10 +1,10 @@
 server:
-  port: 7320
+  port: 7330
   servlet:
     context-path: /v1.0
 spring:
   application:
-    name: ptccsens
+    name: ptcontest
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
@@ -35,6 +35,6 @@ gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/
 apiUrl: http://www.tall.wiki/
 file:
-  path: /home/ptccsens/server/uploads/
+  path: /home/ptcontest/server/uploads/
-  domain: https://www.tall.wiki/gateway/ptccsens
+  domain: https://www.tall.wiki/gateway/ptcontest
-  imgDomain: https://www.tall.wiki/gateway/ptccsens/v1.0/uploads/
+  imgDomain: https://www.tall.wiki/gateway/ptcontest/v1.0/uploads/

src/main/resources/application-test.yml

@@ -1,10 +1,10 @@
 server:
-  port: 7320
+  port: 7330
   servlet:
     context-path: /v1.0
 spring:
   application:
-    name: ptccsens
+    name: ptcontest
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
@@ -43,6 +43,6 @@ eureka:
     ip-address: 127.0.0.1
 
 file:
-  path: /home/ptccsens/server/uploads/
+  path: /home/ptcontest/server/uploads/
-  domain: https://test.tall.wiki/gateway/ptccsens
+  domain: https://test.tall.wiki/gateway/ptcontest
-  imgDomain: https://test.tall.wiki/gateway/ptccsens/v1.0/uploads/
+  imgDomain: https://test.tall.wiki/gateway/ptcontest/v1.0/uploads/

src/main/resources/druid-dev.yml

@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://101.201.226.163:3306/pt_ccsens?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://101.201.226.163:3306/pt_contest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME

src/main/resources/druid-prod.yml

@@ -29,7 +29,7 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
 #      url: jdbc:mysql://127.0.0.1/defaultwbs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
-      url: jdbc:mysql://www.tall.wiki/pt_ccsens?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://www.tall.wiki/pt_contest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/druid-test.yml

@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://test.tall.wiki/pt_ccsens?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://test.tall.wiki/pt_contest?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
 
     <contextName>logback</contextName>
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="/home/cloud/pt_ccsens/log/" />
+    <property name="log.path" value="/home/cloud/pt_contest/server/log/" />
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->

src/main/resources/mapper_dao/ProTaskDetailDao.xml

@@ -537,7 +537,12 @@
         AND ts.plan_start_time != 0
         AND ts.plan_duration != 0
         and rt.role_duty = 0
-        AND rt.role_id = #{roleId}
+        <if test="isPm == 0">
+            AND rt.role_id = #{roleId}
+        </if>
+        <if test="isPm == 1">
+            AND rt.role_id in (SELECT id FROM t_pro_role WHERE project_id = #{projectId} and rec_status = 0)
+        </if>
         <if test="queryType == 0">
             AND plan_start_time &lt; #{timeNode}
         </if>

src/main/resources/mapper_dao/ProTaskSubDao.xml

@@ -157,5 +157,27 @@
         ORDER BY s.plan_start_time
         limit 1
     </select>
+    <select id="getTimeByProgressTaskAndRoleList" resultType="java.lang.Long">
+        SELECT
+        s.plan_start_time
+        FROM
+        t_pro_task_detail d,
+        t_pro_task_sub s,
+        t_pro_role_task r
+        WHERE
+        d.id = s.task_detail_id
+        and d.id = r.task_id
+        and r.role_id in
+        <foreach collection="roleList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and s.plan_start_time &lt;= #{timeNode}
+        and s.plan_end_time &gt; #{timeNode}
+        and d.rec_status = 0
+        and s.rec_status = 0
+        and r.rec_status = 0
+        ORDER BY s.plan_start_time
+        limit 1
+    </select>
 
 </mapper>

src/main/resources/mbg.xml

@@ -21,7 +21,7 @@
 
         <!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://101.201.226.163:3306/pt_ccsens?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
+                        connectionURL="jdbc:mysql://101.201.226.163:3306/pt_contest?useUnicode=true&amp;characterEncoding=UTF-8&amp;tinyInt1isBit=false"
                         userId="root"
                         password="po3OynBO[M3579p6L7)o">
         </jdbcConnection>
@@ -33,7 +33,7 @@
         </javaTypeResolver>
 
         <!-- targetProject:生成PO类的位置 -->
-        <javaModelGenerator targetPackage="com.ccsens.ptccsens.bean.po"
+        <javaModelGenerator targetPackage="com.ccsens.ptcontest.bean.po"
                             targetProject=".\src\main\java">
             <!-- enableSubPackages:是否让schema作为包的后缀 -->
             <property name="enableSubPackages" value="false" />
@@ -50,7 +50,7 @@
 
         <!-- targetPackage：mapper接口生成的位置 -->
         <javaClientGenerator type="XMLMAPPER"
-                             targetPackage="com.ccsens.ptccsens.persist.mapper"
+                             targetPackage="com.ccsens.ptcontest.persist.mapper"
                              targetProject=".\src\main\java">
             <!-- enableSubPackages:是否让schema作为包的后缀 -->
             <property name="enableSubPackages" value="false" />