tall显示配置

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

@@ -14,6 +14,7 @@ import com.ccsens.util.WebConstant;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
     @Autowired
     private IProMemberService proMemberService;
     @Autowired
+    private IProShowService proShowService;
+    @Autowired
     private TaskDetailDao taskDetailDao;
     @Autowired
     private TaskSubTimeDao taskSubTimeDao;
@@ -157,6 +160,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
      * 查看任务 项目成员
      */
     private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception {
+        ProShow proShow = proShowService.selectByProjectId(projectId);
+
         TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo();
         List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
         List<TaskVo.NormalTask> normalTaskList = new ArrayList<>();
@@ -176,7 +181,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setProcess(subTimeMember.getComplatedStatus());
                     normalTask.setRealEndTime(subTimeMember.getRealFinishTime());
                 }
-
+                if(ObjectUtil.isNotNull(proShow)){
+                    normalTask.setShowTimeFormat(proShow.getTimeShow());
+                    if(proShow.getDuration() == 1){
+                        normalTask.setDuration(null);
+                    }
+                }else {
+                    normalTask.setShowTimeFormat("MM-dd HH:mm");
+                }
             }
             TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process);
             if (CollectionUtil.isNotEmpty(task.getGlobalTask())) {