20210416v1.5

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

@@ -37,5 +37,7 @@ public class LwbsDto {
         private Integer priority = 0;
         @ApiModelProperty("任务等级")
         private Byte level=(byte)2;
+        @ApiModelProperty("查询类型(1-我的,2-项目,3-其他)")
+        private Byte queryType;
     }
 }

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

@@ -6,6 +6,7 @@ import com.ccsens.tall.bean.po.ProTaskSubTime;
 import com.ccsens.tall.bean.vo.TaskVo;
 import com.ccsens.tall.bean.vo.WbsVo;
 import com.ccsens.tall.persist.mapper.ProTaskDetailMapper;
+import com.ccsens.tall.util.TaskUtil;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -54,6 +55,13 @@ public interface TaskDetailDao extends ProTaskDetailMapper {
      */
     List<TaskVo.TaskListByProjectId> getTaskByParentId(@Param("parentTaskId")Long parentTaskId,@Param("milestone")Integer milestone,@Param("beginTime")Long beginTime,@Param("endTime")Long endTime);
 
+    /**
+     * LWBS 查询其他任务
+     * @param userId
+     * @return
+     */
+    List<TaskVo.NormalTask> selectOtherTask(Long userId);
+
 //    /**
 //     * 批量添加任务详情表
 //     * @param taskDetailList

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

@@ -114,6 +114,32 @@ public class InputDocService implements IInputDocService {
     @Override
     public TaskVo.ProTaskInfo selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId) {
         TaskVo.ProTaskInfo taskInfo=new TaskVo.ProTaskInfo();
+        //查询其他
+        if (param.getQueryType() == 2){
+            List<TaskVo.NormalTask> taskList = taskDetailDao.selectOtherTask(userId);
+            //区分全局任务和普通任务
+            TaskUtil.Task task = TaskUtil.splitTask(taskList, param.getStartTime(), param.getEndTime(), param.getProcess());
+            List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
+            //如果全局任务不为空
+            if(CollectionUtil.isNotEmpty(task.getGlobalTask())){
+                TaskVo.GlobalTask globalTask = new TaskVo.GlobalTask();
+                for (TaskVo.NormalTask normalTask : task.getGlobalTask()) {
+                    BeanUtil.copyProperties(normalTask,globalTask);
+                    globalTaskList.add(globalTask);
+                }
+                taskInfo.setGlobalTaskList(globalTaskList);
+            }
+            //如果普通任务不为空
+            if (CollectionUtil.isNotEmpty(task.getCommonTask())){
+                taskInfo.setNormalTaskList(task.getCommonTask());
+            }
+            return taskInfo;
+        }
+
+        if (param.getQueryType() == 0){
+            param.setId(null);
+        }
+
         //普通的任务和全局的
         List<TaskVo.NormalTask> normalTaskList1= iInputDocDao.selectByCompany(param,userId);
 
@@ -140,6 +166,7 @@ public class InputDocService implements IInputDocService {
         for (int i = 0; i < normalTaskList1.size(); i++) {
             //拆分项目下得普通任务和全局任务
             List<TaskVo.NormalTask> list= normalTaskList1.get(i).getSecondTasks();
+            //判断全局还是普通任务
             TaskUtil.Task task = TaskUtil.splitTask(list, param.getStartTime(), param.getEndTime(), param.getProcess());
             if(CollectionUtil.isNotEmpty(task.getGlobalTask())){
                 if(param.getId()==null) {

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

@@ -317,6 +317,7 @@ public class UserService implements IUserService {
      */
     private UserVo.UserSign phoneLogin(String phone, String smsVerifyCode) {
         UserVo.UserSign userSignVo;
+        //验证验证码是否正确
         if (isSmsCodeCorrect(phone, smsVerifyCode)) {
             //1.查找对应账户,不存在则注册
             List<SysAuth> authList;

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

@@ -4,6 +4,8 @@
     <resultMap id="ass" type="com.ccsens.tall.bean.vo.TaskVo$NormalTask">
         <id property="projectId" column="pId"/>
         <result property="projectName" column="pName"/>
+        <result property="id" column="times_id"/>
+        <result property="detailId" column="task_id"/>
         <result property="description" column="pDescription"/>
         <result property="beginTime" column="pBeginTime"/>
         <result property="endTime" column="pEndTime"/>

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

@@ -576,4 +576,26 @@
             and t.rec_status = 0
     </select>
 
+    <select id="selectOtherTask" resultType="com.ccsens.tall.bean.vo.TaskVo$NormalTask">
+        SELECT
+            tst.id AS id,
+            tst.begin_time AS beginTime,
+            tst.end_time AS endTime,
+            td.id AS detailId,
+            td. NAME,
+            td.description,
+            td.cycle,
+            td.priority,
+            td.milestone,
+            td.has_group,
+            (
+                tst.end_time - tst.begin_time
+            ) AS duration
+        FROM
+            t_pro_task_detail AS td
+        LEFT JOIN t_pro_task_sub_time AS tst ON td.id = tst.task_detail_id
+        WHERE
+            td.executor_role = #{userId} AND td.rec_status = 0
+    </select>
+
 </mapper>

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -60,7 +60,7 @@ public enum  CodeEnum {
     SUB_TASK_IS_NOT_FINISH(43,"分组内任务未全部完成,无法完成任务",true),
     IS_NOT_CHECKER(44,"您不是该交付物的检查人",true),
     NOT_POWER(45,"对不起，您的权限不足，无法进行此操作",true),
-    SMS_CODE_CORRECT(46,"验证码错误",true),
+    SMS_CODE_CORRECT(46,"请输入正确验证码",true),
 
     QUESTION_RULE_NOT_FOUND(47,"该评测规则未知，请联系开发人员。", true),
     REPORT_DOCTOR_ERROR(48, "对不起，您没有修改报告单结果的权限。", true),