增加周任务

tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java

@@ -138,7 +138,7 @@ public class InputDocDto {
 
     @Data
     @ApiModel("添加交付物")
-    public static class addTaskDeliver {
+    public static class AddTaskDeliver {
         @NotNull(message = "请选择要添加交付物的任务")
         @ApiModelProperty("任务id")
         private Long taskId;
@@ -149,7 +149,7 @@ public class InputDocDto {
 
     @Data
     @ApiModel("删除交付物")
-    public static class deleteTaskDeliver {
+    public static class DeleteTaskDeliver {
         @NotNull(message = "请选择要删除的交付物")
         @ApiModelProperty("交付物id")
         private Long deliverId;

tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java

@@ -483,4 +483,15 @@ public class TaskDto {
         @ApiModelProperty("交付物名称")
         public String names;
     }
+
+    @Data
+    @ApiModel
+    public static class AboutWeekTask {
+        @ApiModelProperty("项目id")
+        private List<Long> projectIds;
+        @ApiModelProperty("开始时间")
+        private Long startTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+    }
 }

tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java

@@ -522,4 +522,33 @@ public class TaskVo {
         @ApiModelProperty("二级任务")
         private List<TaskListByProjectId> secondTasks;
     }
+
+    @Data
+    @ApiModel("每周任务的交付物")
+    public static class AboutWeekTask {
+        @JsonIgnore
+        @ApiModelProperty("任务详情名称")
+        private String detailId;
+        @ApiModelProperty("任务详情名称")
+        private String detailName;
+        @ApiModelProperty("任务结束时间")
+        private Long taskOverTime;
+        @ApiModelProperty("任务时长")
+        private Long taskMin;
+        @ApiModelProperty("任务完成状态:0未开始 1进行中 2已结束")
+        private Integer taskOverStatus;
+        @ApiModelProperty("交付物")
+        private List<WeekTaskOfDeliver> delivers;
+    }
+    @Data
+    @ApiModel("周任务下的交付物")
+    public static class WeekTaskOfDeliver {
+        @ApiModelProperty("交付物名称")
+        private String deliverName;
+        @ApiModelProperty("交付物上传状态")
+        private Byte deliverUploadOfStatus;
+        @ApiModelProperty("交付物检查状态")
+        private Byte deliverCheckOfStatus;
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.ccsens.tall.persist.dao;
 
 import com.ccsens.tall.bean.vo.DeliverVo;
 import com.ccsens.tall.bean.vo.ProjectVo;
+import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.bean.vo.WbsVo;
 import com.ccsens.tall.persist.mapper.ProTaskDeliverMapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +48,11 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{
      * @return 项目经理的id
      */
     List<Long> selectPMIdByDeliverId(Long deliverId);
+
+    /**
+     * 查看每周任务下的交付物
+     * @param detailId 任务详情id
+     * @return 交付物
+     */
+    List<TaskVo.WeekTaskOfDeliver> selectWeekTaskOfDeliver(String detailId);
 }

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

@@ -78,4 +78,21 @@ public interface TaskDetailDao extends ProTaskDetailMapper {
      * @return 项目经理id
      */
     Long selectPmByTaskId(Long id);
+
+    /**
+     * 通过项目id和用户id查询角色信息
+     * @param projectIds 项目id  List
+     * @param userId     用户id
+     * @return   角色id List
+     */
+    List<Long> selectAllRolesOfProject(@Param("projectIds") List<Long> projectIds,@Param("userId") Long userId);
+
+    /**
+     * 查找此负责人下的任务
+     * @param roleIds 负责人id List
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 分解任务 List
+     */
+    List<TaskVo.AboutWeekTask> selectTaskByExecutorRoleId(@Param("roleIds") List<Long> roleIds,@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 }

tall/src/main/java/com/ccsens/tall/service/IInputDocService.java

@@ -38,17 +38,17 @@ public interface IInputDocService {
     /**
      * 查看文档文件上传记录
      *
-     * @param param
-     * @return
+     * @param param 入参
+     * @return 历史记录
      */
     List<InputDocVo.HistoryRecord> viewDocHistory(InputDocDto.ViewDocHistory param);
 
     /**
      * 添加输入文档
      *
-     * @param param
+     * @param param 入参
      */
-    void addDoc(InputDocDto.AddDoc param);
+    TaskVo.NormalTask addDoc(InputDocDto.AddDoc param,Long userId) throws Exception;
 
     /**
      * 修改输入文档
@@ -107,6 +107,6 @@ public interface IInputDocService {
      *
      * @param param
      */
-    void deleteDoc(InputDocDto.DeleteDoc param);
+    TaskVo.NormalTask deleteDoc(InputDocDto.DeleteDoc param,Long userId) throws Exception;
 }
 

tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java

@@ -56,6 +56,14 @@ public interface IProTaskDetailService {
      */
     List<TaskVo.TaskListByProjectId> queryAllTaskByProjectId(Long currentUserId, TaskDto.QueryAllTaskByProjectId projectId) throws Exception;
 
+    /**
+     * 周会任务相关
+     * @param param 参数
+     * @param userId 用户id
+     * @return 周会相关
+     */
+    List<TaskVo.AboutWeekTask> selectAboutWeekTask(TaskDto.AboutWeekTask param, Long userId);
+
 //    /**
 //     * 新增和修改交付物的方法
 //     * @param jiaoFuWu

tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java

@@ -44,25 +44,27 @@ public interface ITaskDeliverService {
     List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskId(Long currentUserId, Long taskId);
     /**
      * 删除输出文档下所有的文件
-     * @param param
+     * @param param 参数
      */
     void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver param,Long userId) throws Exception;
 
     /**
      * 修改输出文档下的备注信息
-     * @param param
+     * @param param 参数
      */
     void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param,Long userId);
 
     /**
      * 添加交付物
-     * @param param
+     * @param param 参数
+     * @param userId  用户id
      */
-    void addTaskDeliver(InputDocDto.addTaskDeliver param);
+    TaskVo.NormalTask addTaskDeliver(InputDocDto.AddTaskDeliver param,Long userId) throws Exception;
 
     /**
      * 删除交付物
-     * @param param
+     * @param param 参数
+     * @param userId 用户id
      */
-    void deleteTaskDeliver(InputDocDto.deleteTaskDeliver param);
+    TaskVo.NormalTask deleteTaskDeliver(InputDocDto.DeleteTaskDeliver param,Long userId) throws Exception;
 }

tall/src/main/java/com/ccsens/tall/service/InputDocService.java

@@ -58,6 +58,8 @@ public class InputDocService implements IInputDocService {
     private IProMemberService iProMemberService;
     @Resource
     private TaskDeliverService taskDeliverService;
+    @Resource
+    private ProTaskDetailService taskDetailService;
 
 
 //    /**
@@ -133,7 +135,7 @@ public class InputDocService implements IInputDocService {
         }
         ProTaskInputDoc doc = proTaskInputDocMapper.selectByPrimaryKey(param.getDocId());
         if (ObjectUtil.isNull(doc)){
-            throw new BaseException("输入文档不存在或已删除");
+            throw new BaseException(CodeEnum.DOC_NONE);
         }
         //历史操作
         ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
@@ -253,8 +255,8 @@ public class InputDocService implements IInputDocService {
      * 添加输入文档
      */
     @Override
-    public void addDoc(InputDocDto.AddDoc param) {
-
+    public TaskVo.NormalTask addDoc(InputDocDto.AddDoc param,Long currentUserId) throws Exception {
+        TaskVo.NormalTask normalTask = null;
         //查找任务详情id
         Long taskDetailId = null;
         ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(param.getTaskId());
@@ -267,6 +269,7 @@ public class InputDocService implements IInputDocService {
                 if(ObjectUtil.isNotNull(task)){
                     taskDetailId = task.getId();
                 }
+                taskDetail = taskDetailDao.selectByPrimaryKey(taskDetailId);
             }
         }
         if(taskDetailId == null) {
@@ -288,7 +291,8 @@ public class InputDocService implements IInputDocService {
             proTaskInputDoc.setName(param.getFileName()[i]);
             proTaskInputDocMapper.insertSelective(proTaskInputDoc);
         }
-
+        normalTask = taskDetailService.getTaskInfoByTaskId(currentUserId, taskDetail.getProjectId(), param.getTaskId(), null);
+        return normalTask;
     }
 
     /**
@@ -601,16 +605,25 @@ public class InputDocService implements IInputDocService {
     /**
      * 删除输入文档
      *
-     * @param param
+     * @param param 参数
      */
     @Override
-    public void deleteDoc(InputDocDto.DeleteDoc param) {
+    public TaskVo.NormalTask deleteDoc(InputDocDto.DeleteDoc param,Long currentUserId) throws Exception {
+        TaskVo.NormalTask taskById = null;
+
         ProTaskInputDoc proTaskInputDoc = proTaskInputDocMapper.selectByPrimaryKey(param.getDocId());
         if (ObjectUtil.isNotNull(proTaskInputDoc)){
             proTaskInputDoc.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
             proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc);
-            //proTaskInputDocMapper.updateByPrimaryKey(proTaskInputDoc);
+        }else{
+            throw new BaseException(CodeEnum.DOC_NONE);
+        }
+
+        ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(proTaskInputDoc.getTaskDetailId());
+        if (ObjectUtil.isNotNull(taskDetail)){
+            taskById = taskDetailService.getTaskInfoByTaskId(currentUserId, taskDetail.getProjectId(), taskDetail.getId(), null);
         }
+        return taskById;
     }
 
 

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -110,11 +110,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
         taskInfoByRoleId.setEndTime(taskInfoByRoleId.getEndTime() == null ? sysProject.getEndTime() : taskInfoByRoleId.getEndTime());
 
         Object obj = null;
-        ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId());    //查到了项目下的角色信息
+        //查到了项目下的角色信息
+        ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId());
         if (ObjectUtil.isNull(role)) {
             throw new BaseException(CodeEnum.NOT_ROLE);
         }
-        ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId());       //查到了项目下的父角色信息
+        //查到了项目下的父角色信息
+        ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId());
         if (ObjectUtil.isNull(parentRole)) {
             throw new BaseException(CodeEnum.NOT_ROLE);
         }
@@ -1784,6 +1786,38 @@ public class ProTaskDetailService implements IProTaskDetailService {
         return taskList;
     }
 
+    /**
+     *
+     * @param param 参数
+     * @param userId 用户id
+     * @return 周会相关
+     */
+    @Override
+    public List<TaskVo.AboutWeekTask> selectAboutWeekTask(TaskDto.AboutWeekTask param, Long userId) {
+        List<TaskVo.AboutWeekTask> weekTaskList = new ArrayList<>();
+        if (CollectionUtil.isEmpty(param.getProjectIds())){
+            throw new BaseException(CodeEnum.NOT_PROJECT);
+        }
+        //如果未传开始结束时间,获取本周的开始和结束时间
+        Long startTime = param.getStartTime() == null ? cn.hutool.core.date.DateUtil.beginOfWeek(new Date()).getTime() : param.getStartTime();
+        Long endTime = param.getEndTime() == null ? cn.hutool.core.date.DateUtil.endOfWeek(new Date()).getTime() : param.getEndTime();
+
+        //查询当前用户在项目中所属的角色
+        List<Long> roleIds = taskDetailDao.selectAllRolesOfProject(param.getProjectIds(),userId);
+        if(CollectionUtil.isNotEmpty(roleIds)){
+            //查找每周任务相关
+            weekTaskList = taskDetailDao.selectTaskByExecutorRoleId(roleIds,startTime,endTime);
+            if(CollectionUtil.isNotEmpty(weekTaskList)){
+                for (TaskVo.AboutWeekTask weekTask : weekTaskList) {
+                    List<TaskVo.WeekTaskOfDeliver> weekTaskOfDelivers = taskDeliverDao.selectWeekTaskOfDeliver(weekTask.getDetailId());
+                    weekTask.setDelivers(weekTaskOfDelivers);
+                }
+            }
+        }
+
+        return weekTaskList;
+    }
+
     /**
      * 新增和修改交付物
      * @param jiaoFuWu

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -82,6 +82,8 @@ public class TaskDeliverService implements ITaskDeliverService {
     private IProMemberService iProMemberService;
     @Resource
     private ProDeliverHistoryRecordDao deliverHistoryRecordDao;
+    @Resource
+    private ProTaskDetailService taskDetailService;
 
     @Override
     public void saveDeliver(ProTaskDeliver taskDeliver) {
@@ -1244,10 +1246,12 @@ public class TaskDeliverService implements ITaskDeliverService {
 
     /**
      * 添加交付物
-     * @param param
+     * @param param 参数
      */
     @Override
-    public void addTaskDeliver(InputDocDto.addTaskDeliver param) {
+    public TaskVo.NormalTask addTaskDeliver(InputDocDto.AddTaskDeliver param,Long userId) throws Exception {
+        TaskVo.NormalTask normalTask;
+
         //查找任务详情id
         Long taskDetailId = null;
         ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(param.getTaskId());
@@ -1283,15 +1287,26 @@ public class TaskDeliverService implements ITaskDeliverService {
             proTaskDeliver.setIsInput(0);
             taskDeliverDao.insertSelective(proTaskDeliver);
         }
+
+        normalTask = taskDetailService.getTaskInfoByTaskId(userId, taskDetail.getProjectId(), param.getTaskId(), null);
+        return normalTask;
     }
 
     @Override
-    public void deleteTaskDeliver(InputDocDto.deleteTaskDeliver param) {
+     public TaskVo.NormalTask deleteTaskDeliver(InputDocDto.DeleteTaskDeliver param,Long userId) throws Exception {
+        TaskVo.NormalTask normalTask = null;
+
         ProTaskDeliver proTaskDeliver = taskDeliverDao.selectByPrimaryKey(param.getDeliverId());
         if (ObjectUtil.isNotNull(proTaskDeliver)){
             proTaskDeliver.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
             taskDeliverDao.updateByPrimaryKeySelective(proTaskDeliver);
         }
+
+        ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(proTaskDeliver.getTaskDetailId());
+        if (ObjectUtil.isNotNull(taskDetail)){
+            normalTask = taskDetailService.getTaskInfoByTaskId(userId, taskDetail.getProjectId(),taskDetail.getId(), null);
+        }
+        return normalTask;
     }
 }
 

tall/src/main/java/com/ccsens/tall/web/InputDocController.java

@@ -6,6 +6,7 @@ import com.ccsens.tall.bean.dto.InputDocDto;
 import com.ccsens.tall.bean.dto.LabelDto;
 import com.ccsens.tall.bean.vo.InputDocVo;
 import com.ccsens.tall.bean.vo.LabelVo;
+import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.service.IInputDocService;
 import com.ccsens.tall.service.TaskDeliverService;
 import com.ccsens.util.JsonResponse;
@@ -85,41 +86,41 @@ public class InputDocController {
     @MustLoginTall
     @ApiOperation(value = "给任务添加输入文档", notes = "1007:添加输入文档")
     @RequestMapping(value = "/addDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse addDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.AddDoc> params) {
+    public JsonResponse<TaskVo.NormalTask> addDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.AddDoc> params) throws Exception {
         log.info("添加输入文档：{}",params);
-        iInputDocService.addDoc(params.getParam());
+        TaskVo.NormalTask normalTask= iInputDocService.addDoc(params.getParam(),params.getUserId());
         log.info("添加输入文档");
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(normalTask);
     }
 
     @MustLoginTall
     @ApiOperation(value = "删除任务下的输入文档", notes = "1007:删除输入文档")
     @RequestMapping(value = "/deleteDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse deleteDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.DeleteDoc> params) {
+    public JsonResponse<TaskVo.NormalTask> deleteDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.DeleteDoc> params) throws Exception {
         log.info("删除输入文档：{}",params);
-        iInputDocService.deleteDoc(params.getParam());
+        TaskVo.NormalTask normalTask = iInputDocService.deleteDoc(params.getParam(),params.getUserId());
         log.info("删除输入文档");
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(normalTask);
     }
 
     @MustLoginTall
     @ApiOperation(value = "给任务添加交付物", notes = "1007:添加交付物")
     @RequestMapping(value = "/addTaskDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse addTaskDeliver(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.addTaskDeliver> params) {
+    public JsonResponse<TaskVo.NormalTask> addTaskDeliver(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.AddTaskDeliver> params) throws Exception {
         log.info("添加交付物：{}",params);
-        taskDeliverService.addTaskDeliver(params.getParam());
+        TaskVo.NormalTask normalTask = taskDeliverService.addTaskDeliver(params.getParam(),params.getUserId());
         log.info("添加交付物");
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(normalTask);
     }
 
     @MustLoginTall
     @ApiOperation(value = "删除任务下的交付物", notes = "1007:删除交付物")
     @RequestMapping(value = "/deleteTaskDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse deleteTaskDeliver(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.deleteTaskDeliver> params) {
+    public JsonResponse<TaskVo.NormalTask> deleteTaskDeliver(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.DeleteTaskDeliver> params) throws Exception {
         log.info("删除交付物：{}",params);
-        taskDeliverService.deleteTaskDeliver(params.getParam());
+        TaskVo.NormalTask normalTask = taskDeliverService.deleteTaskDeliver(params.getParam(),params.getUserId());
         log.info("删除交付物");
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(normalTask);
     }
 
 

tall/src/main/java/com/ccsens/tall/web/TaskController.java

@@ -1,6 +1,7 @@
 package com.ccsens.tall.web;
 
 import cn.hutool.core.date.DateUtil;
+import com.ccsens.tall.annotation.MustLoginTall;
 import com.ccsens.tall.bean.dto.ProjectDto;
 import com.ccsens.tall.bean.dto.TaskDto;
 import com.ccsens.tall.bean.vo.TaskVo;
@@ -9,6 +10,7 @@ import com.ccsens.tall.service.ITaskSubTimeService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.WebConstant;
 import com.ccsens.util.annotation.OperateType;
+import com.ccsens.util.bean.dto.QueryDto;
 import io.jsonwebtoken.Claims;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -312,4 +314,12 @@ public class TaskController {
         TaskVo.NormalTask taskInfo = taskDetailService.updateTaskConfig(currentUserId,updateTaskConfig);
         return JsonResponse.newInstance().ok(taskInfo);
     }
+
+    @MustLoginTall
+    @ApiOperation(value = "周会任务相关",notes = "")
+    @RequestMapping(value = "/aboutWeekTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<TaskVo.AboutWeekTask>> aboutWeekTask(@ApiParam @Validated @RequestBody QueryDto<TaskDto.AboutWeekTask> params) throws Exception {
+        List<TaskVo.AboutWeekTask> aboutWeekTask = taskDetailService.selectAboutWeekTask(params.getParam(),params.getUserId());
+        return JsonResponse.newInstance().ok(aboutWeekTask);
+    }
 }

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

@@ -299,6 +299,7 @@
             t_pro_task_deliver AS ptd
         WHERE
             ptd.task_detail_id = #{taskId}
+         AND ptd.rec_status = 0
     </select>
 
     <select id="selectPMIdByDeliverId" resultType="java.lang.Long">
@@ -334,4 +335,16 @@
                 `name` = 'PM'
         )
     </select>
+
+    <select id="selectWeekTaskOfDeliver" resultType="com.ccsens.tall.bean.vo.TaskVo$WeekTaskOfDeliver">
+        SELECT
+            td.name AS deliverName,
+            td.check_status AS deliverCheckOfStatus,
+            td.is_upload AS deliverUploadOfStatus
+        FROM
+            t_pro_task_deliver AS td
+        WHERE
+            td.task_detail_id = #{detailId}
+        and td.rec_status = 0
+    </select>
 </mapper>

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

@@ -170,7 +170,7 @@
             t.sAccount as sAccount,
             t.sPhone as sPhone
         FROM
-        t_pro_member m LEFT JOIN t_pro_member_role mr on mr.member_id = m.id
+        t_pro_member m LEFT JOIN t_pro_member_role mr on mr.member_id = m.id and mr.rec_status = 0
         LEFT JOIN t_pro_role r on r.id = mr.role_id
         LEFT JOIN t_sys_auth a on a.user_id = m.user_id and a.identify_type = 3 and a.rec_status = 0
         LEFT JOIN
@@ -198,7 +198,6 @@
         (r.rec_status = 0 or r.rec_status is null)
         and
         m.project_id = #{projectId}
-        and mr.rec_status = 0
     </select>
 
     <select id="getMemberInfoByMemberId" parameterType="java.util.Map" resultMap="memberInfos">

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

@@ -10,6 +10,7 @@
             t_pro_task_input_doc AS tid
         WHERE
             tid.task_detail_id = #{taskId}
+         AND tid.rec_status = 0
     </select>
 
 </mapper>

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

@@ -760,4 +760,41 @@
                 `name` = 'PM'
         )
     </select>
+
+    <select id="selectAllRolesOfProject" resultType="java.lang.Long">
+        SELECT
+            mr.role_id
+        FROM
+            t_pro_member AS pm
+        LEFT JOIN t_pro_member_role AS mr ON pm.id = mr.member_id
+        LEFT JOIN t_pro_role AS pr ON pr.id = mr.role_id
+        AND mr.rec_status = 0
+        WHERE
+            pm.user_id = #{userId}
+            AND pm.project_id IN
+        <foreach collection="projectIds" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectTaskByExecutorRoleId" resultType="com.ccsens.tall.bean.vo.TaskVo$AboutWeekTask">
+        SELECT
+            td.id AS detailId,
+            td.name AS detailName,
+            (tst.end_time-tst.begin_time) AS taskMin,
+            tst.end_time AS taskOverTime,
+            tst.complated_status AS taskOverStatus
+        FROM
+            t_pro_task_sub_time AS tst
+        LEFT JOIN t_pro_task_detail AS td ON tst.task_detail_id = td.id
+        WHERE
+            tst.rec_status = 0
+        AND td.rec_status = 0
+        AND td.executor_role IN
+        <foreach collection="roleIds" open="(" close=")" separator="," item="item">
+            #{item}
+        </foreach>
+        AND tst.begin_time &gt;= #{startTime}
+        AND tst.end_time &lt;= #{endTime}
+    </select>
 </mapper>

util/src/test/java/com/ccsens/util/TestQrCord.java

@@ -44,9 +44,9 @@ public class TestQrCord {
             BitMatrix bitMatrix =qrCodeWriter.encode(text,BarcodeFormat.QR_CODE, 1000, 1000,hints);
             //BitMatrix bitMatrix = qrCodeWriter.encode(text, BarcodeFormat.QR_CODE, width, height);
 
-            Path path = FileSystems.getDefault().getPath(WebConstant.UPLOAD_PATH_BASE + "/" + fileName);
+            //Path path = FileSystems.getDefault().getPath(WebConstant.UPLOAD_PATH_BASE + "/" + fileName);
 
-            MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
+            //MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
 //        }
 //        String text = "https://test.tall.wiki/respond?groupId=1&groupName=1组";
 //        String fileName = "zzz/" + DateUtil.today() + "/" + 1+"组" + ".png";

util/src/test/java/com/ccsens/util/VideoTest.java

@@ -98,22 +98,22 @@ public class VideoTest {
 
         // 指定资源地址，下载文件测试
 //        downloadFile("http://1258473962.vod2.myqcloud.com/1e124671vodcq1258473962/76557f735285890810478037694/VCj25SXUgFsA.mp4", "D:/temp/");
-        List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\逗\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
-        for (int i = 0; i < objects.size(); i++) {
-            Object[] obj = objects.get(i);
-            if (obj == null || obj.length < 4) {
-                continue;
-            }
-            String path = (String)obj[3];
-            String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
-            try{
-                downloadFile(path, dir);
-            } catch (Exception e) {
-                System.out.println("下载失败：" + dir);
-                e.printStackTrace();
-
-            }
-        }
+//        List<Object[]> objects = PoiUtil.readExce(new File("C:\\Users\\逗\\Desktop\\跳绳比赛选手证件照.xlsx"), 0, null, 0, false);
+//        for (int i = 0; i < objects.size(); i++) {
+//            Object[] obj = objects.get(i);
+//            if (obj == null || obj.length < 4) {
+//                continue;
+//            }
+//            String path = (String)obj[3];
+//            String dir = "D:\\选手证件照\\" + obj[0] + "\\" + obj[1] + "\\" + obj[2];
+//            try{
+//                downloadFile(path, dir);
+//            } catch (Exception e) {
+//                System.out.println("下载失败：" + dir);
+//                e.printStackTrace();
+//
+//            }
+//        }
 
     }
 }