查询任务详情可以查出交付物信息4.14

4 years ago · 271810c0e2
12 changed files with 115 additions and 12 deletions
--- a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java
@ -223,6 +223,8 @@ public class TaskDto {
        private List<Long> plugins;
        @ApiModelProperty("任务提醒信息")
        private List<TaskRemind> taskRemindList;
+        @ApiModelProperty("父任务id")
+        private Long parentId;
    }
    @Data
    @ApiModel("修改任务时修改交付物名称")
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java
@ -189,4 +189,13 @@ public class DeliverVo {
        private List<FileVo.FilePosition> fileList = new ArrayList<>();
    }

+    @ApiModel
+    @Data
+    public static class OutputDocInfo{
+        @ApiModelProperty("输出文档id")
+        private Long id;
+        @ApiModelProperty("输出文档名称")
+        private String name;
+    }
+
 }
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java
@ -117,5 +117,13 @@ public class InputDocVo {
        private String fileIds;
    }

+    @Data
+    @ApiModel
+    public static class InputDocInfo{
+        @ApiModelProperty("输入文档id")
+        private Long id;
+        @ApiModelProperty("输入文档名称")
+        private String name;
+    }

 }
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@ -157,6 +157,10 @@ public class TaskVo {
        private Byte priority;
        @ApiModelProperty("是否是里程碑 0否 1里程碑 2普通任务 3关键任务")
        private String milestone;
+        @ApiModelProperty("输入文档的信息")
+        private List<InputDocVo.InputDocInfo> inputDoc;
+        @ApiModelProperty("输出文档的信息")
+        private List<DeliverVo.OutputDocInfo> outputDoc;
        @ApiModelProperty("提醒的信息")
        private List<RemindInfo> remindInfoList;
        public Long getDuration(){
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskInputDocDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskInputDocDao.java
@ -0,0 +1,21 @@
+package com.ccsens.tall.persist.dao;
+
+import com.ccsens.tall.bean.vo.InputDocVo;
+import com.ccsens.tall.persist.mapper.ProTaskInputDocMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author mz
+ */
+@Repository
+public interface ProTaskInputDocDao extends ProTaskInputDocMapper {
+
+    /**
+     * 根据任务详情id查询输入文档
+     * @param taskId
+     * @return 输入文档
+     */
+    List<InputDocVo.InputDocInfo> selectDocByTaskId(Long taskId);
+}
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java
@ -33,4 +33,11 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{
     * @return 返回交付物详情
     */
    List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskId(@Param("userId")Long userId, @Param("subTimeId")Long subTimeId, @Param("taskDetailId")Long taskDetailId);
+
+    /**
+     * 根据任务详情id查询输出文档的列表
+     * @param taskId
+     * @return
+     */
+    List<DeliverVo.OutputDocInfo> selectOutputDocByTaskId(Long taskId);
 }
--- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
@ -67,6 +67,8 @@ public class InputDocService implements IInputDocService {
    private ProDeliverHistoryRecordDao deliverHistoryRecordDao;
    @Resource
    private IProMemberService iProMemberService;
+    @Resource
+    private ProPluginConfigDao pluginConfigDao;



@ -106,6 +108,7 @@ public class InputDocService implements IInputDocService {
        TaskVo.ProTaskInfo taskInfo=new TaskVo.ProTaskInfo();
        //普通的任务和全局的
        List<TaskVo.NormalTask> normalTaskList1= iInputDocDao.selectByCompany(param,userId);
+
        //给二级任务下添加子任务
        //遍历项目
        if(param.getId()!=null){
@ -164,6 +167,19 @@ public class InputDocService implements IInputDocService {
        }
        taskInfo.setGlobalTaskList(globalTaskList);
        taskInfo.setNormalTaskList(normalTaskList);
+        for (TaskVo.NormalTask normalTask : taskInfo.getNormalTaskList()) {
+            if (null != normalTask.getDetailId()){
+                ProPluginConfigExample configExample = new ProPluginConfigExample();
+                configExample.createCriteria().andTaskIdEqualTo(normalTask.getDetailId()).andPlaceLocationEqualTo((byte) 0);
+                List<ProPluginConfig> proPluginConfigs = pluginConfigDao.selectByExample(configExample);
+                if (CollectionUtil.isNotEmpty(proPluginConfigs)){
+                    ProPluginConfig config = proPluginConfigs.get(0);
+                    normalTask.setImportParam(config.getImportParam());
+                    normalTask.setRoutineLocation(config.getRoutineLocation());
+                    normalTask.setWebPath(config.getWebPath());
+                }
+            }
+        }

        return taskInfo;
    }
--- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
@ -10,10 +10,7 @@ import com.ccsens.cloudutil.feign.MtFeignClient;
 import com.ccsens.tall.bean.dto.ProjectDto;
 import com.ccsens.tall.bean.dto.TaskDto;
 import com.ccsens.tall.bean.po.*;
-import com.ccsens.tall.bean.vo.MemberVo;
-import com.ccsens.tall.bean.vo.PluginVo;
-import com.ccsens.tall.bean.vo.ProjectVo;
-import com.ccsens.tall.bean.vo.TaskVo;
+import com.ccsens.tall.bean.vo.*;
 import com.ccsens.tall.persist.dao.*;
 import com.ccsens.tall.persist.dao.ProTaskShowDao;
 import com.ccsens.tall.persist.mapper.ProPluginConfigMapper;
@ -95,7 +92,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
    @Resource
    private ProTaskDeliverMapper proTaskDeliverMapper;
    @Resource
-    private ProTaskInputDocMapper proTaskInputDocMapper;
+    private ProTaskInputDocDao proTaskInputDocDao;

    @Override
    public void saveTaskDetail(ProTaskDetail taskDetail) {
@ -788,6 +785,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
                taskDetail.getSecondTasks().addAll(groupTaskList);
            }
        }
+        //查询此任务下的输入文档
+        List<InputDocVo.InputDocInfo> inputDocInfos = proTaskInputDocDao.selectDocByTaskId(taskDetail.getDetailId());
+        if (CollectionUtil.isNotEmpty(inputDocInfos)){
+            taskDetail.setInputDoc(inputDocInfos);
+        }
+        //查询此任务下的输出文档
+        List<DeliverVo.OutputDocInfo> outputDocInfos = taskDeliverDao.selectOutputDocByTaskId(taskDetail.getDetailId());
+        if (CollectionUtil.isNotEmpty(outputDocInfos)){
+            taskDetail.setOutputDoc(outputDocInfos);
+        }
        return taskDetail;
    }

@ -1342,6 +1349,10 @@ public class ProTaskDetailService implements IProTaskDetailService {
                    if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) {
                        taskDetail.setMilestone(updateTaskInfo.getMilestone());
                    }
+                    //父任务id
+                    if(null != updateTaskInfo.getParentId()){
+                        taskDetail.setParentId(updateTaskInfo.getParentId());
+                    }
                    //时间
                    if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) ||
                            ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) ||
@ -1419,10 +1430,10 @@ public class ProTaskDetailService implements IProTaskDetailService {
                        updateTaskInfo.getInputList().forEach(taskDeliver -> {
                            if (StrUtil.isNotEmpty(taskDeliver.getDeliverName())) {
                                if (ObjectUtil.isNotNull(taskDeliver.getDeliverId())) {
-                                    ProTaskInputDoc deliver = proTaskInputDocMapper.selectByPrimaryKey(taskDeliver.getDeliverId());
+                                    ProTaskInputDoc deliver = proTaskInputDocDao.selectByPrimaryKey(taskDeliver.getDeliverId());
                                    if (ObjectUtil.isNotNull(deliver)) {
                                        deliver.setName(taskDeliver.getDeliverName());
-                                        proTaskInputDocMapper.updateByPrimaryKeySelective(deliver);
+                                        proTaskInputDocDao.updateByPrimaryKeySelective(deliver);
                                    }
                                } else {
                                    ProTaskInputDoc deliver = new ProTaskInputDoc();
@ -1430,7 +1441,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                                    deliver.setTaskDetailId(taskDetail.getId());
                                    deliver.setName(taskDeliver.getDeliverName());
                                    deliver.setIsUpload(0);
-                                    proTaskInputDocMapper.insertSelective(deliver);
+                                    proTaskInputDocDao.insertSelective(deliver);
                                }
                            }
                        });
@ -1701,12 +1712,12 @@ public class ProTaskDetailService implements IProTaskDetailService {
            proTaskDeliver.setId(jiaoFuWu.getId());
            proTaskDeliver.setName(jiaoFuWu.getNames());
            proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0);
-            proTaskInputDocMapper.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample);
+            proTaskInputDocDao.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample);
        }else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) {
            //新增
            proTaskDeliver.setId(snowflake.nextId());
            proTaskDeliver.setName(jiaoFuWu.getNames());
-            proTaskInputDocMapper.insertSelective(proTaskDeliver);
+            proTaskInputDocDao.insertSelective(proTaskDeliver);
        }
    }
 }
--- a/tall/src/main/java/com/ccsens/tall/service/UserService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java
@ -366,7 +366,7 @@ public class UserService implements IUserService {
                throw new BaseException(CodeEnum.PASSWORD_ERROR);
            }
        } else {
-            throw new BaseException(CodeEnum.NOT_ACCOUNT);
+            throw new BaseException(CodeEnum.PASSWORD_ERROR);
        }
        long end = System.currentTimeMillis();
        log.info("查询并验证账号用时：{}",end - start);
--- a/tall/src/main/resources/mapper_dao/DeliverDao.xml
+++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml
@ -290,4 +290,14 @@
            d.task_detail_id = #{taskDetailId}
        and d.rec_status = 0
    </select>
+
+    <select id="selectOutputDocByTaskId" resultType="com.ccsens.tall.bean.vo.DeliverVo$OutputDocInfo">
+        SELECT
+            ptd.id,
+            ptd.`name`
+        FROM
+            t_pro_task_deliver AS ptd
+        WHERE
+            ptd.task_detail_id = #{taskId}
+    </select>
 </mapper>
--- a/tall/src/main/resources/mapper_dao/ProTaskInputDocDao.xml
+++ b/tall/src/main/resources/mapper_dao/ProTaskInputDocDao.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.tall.persist.dao.ProTaskInputDocDao">
+
+    <select id="selectDocByTaskId" resultType="com.ccsens.tall.bean.vo.InputDocVo$InputDocInfo">
+        SELECT
+            tid.id,
+            tid.`name`
+        FROM
+            t_pro_task_input_doc AS tid
+        WHERE
+            tid.task_detail_id = #{taskId}
+    </select>
+
+</mapper>
--- a/util/src/main/java/com/ccsens/util/CodeEnum.java
+++ b/util/src/main/java/com/ccsens/util/CodeEnum.java
@ -124,7 +124,7 @@ public enum  CodeEnum {

    NICKNAME_REPEAT(102,"该名字已经存在，请换一个再试",true),
    NEW_PASSWORD_REPEAT_OLD(103,"新密码不能和旧密码相同",true),
-    PASSWORD_ERROR(104,"密码错误",true),
+    PASSWORD_ERROR(104,"账号或密码错误",true),
    NOT_ACCOUNT(105,"未找到该账号",true),

    FILE_NOT_FOUND(106,"未找到对应的文件，请检查后操作",true),