diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index aba56123..8ed9d7af 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -179,7 +179,7 @@ public class ExcelService implements IExcelService { private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId, SysProject sysProject) throws Exception { XSSFRow row = wbsSheet.getRow(projectInfoStart + 1); if(ObjectUtil.isNull(row)){ - throw new BaseException(CodeEnum.notProject(wbsSheet.getSheetName() + (projectInfoStart + 1))); +// throw new BaseException(CodeEnum.notProject(wbsSheet.getSheetName() ,(projectInfoStart + 1))); } String projectName = ExcelUtil.getCellValue(row.getCell(0)); if (StrUtil.isNotEmpty(projectName)) { @@ -334,7 +334,6 @@ public class ExcelService implements IExcelService { role.setDescription(WebConstant.ROLE_NAME.ProjectVirtualRole.phase); } else { throw new BaseException(CodeEnum.WBS_NOT_FIRST_ROLE.addMsg(wbsSheet.getSheetName() + (i+1))); - } proRoleService.saveProRole(role); proRoles.add(role); diff --git a/tall/src/main/java/com/ccsens/tall/service/ILwbsService.java b/tall/src/main/java/com/ccsens/tall/service/ILwbsService.java new file mode 100644 index 00000000..1668e2b2 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/service/ILwbsService.java @@ -0,0 +1,7 @@ +package com.ccsens.tall.service; + +/** + * @author 逗 + */ +public interface ILwbsService { +} diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index de74c18c..cc16413d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -103,17 +103,6 @@ public class InputDocService implements IInputDocService { return selByUserIdToComProjectVos; } - public TaskVo.ProTaskInfo queryLwbs(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { - - if(ObjectUtil.isNotNull(param.getId())){ - //如果项目id为空。则查询所有 - - }else { - //项目id不为空。查询单个项目 - - } - return null; - } @Override public TaskVo.ProTaskInfo selByProjectIdToTask(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { TaskVo.ProTaskInfo taskInfo=new TaskVo.ProTaskInfo(); diff --git a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java new file mode 100644 index 00000000..19ae1f88 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java @@ -0,0 +1,101 @@ +package com.ccsens.tall.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.tall.bean.dto.LwbsDto; +import com.ccsens.tall.bean.po.ProRole; +import com.ccsens.tall.bean.po.ProShow; +import com.ccsens.tall.bean.po.ProShowExample; +import com.ccsens.tall.bean.po.ProSubTimeMember; +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.util.TaskUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class LwbsService implements ILwbsService{ + + + public TaskVo.ProTaskInfo queryLwbs(LwbsDto.SelByProjectIdToTaskDto param, Long userId) { + + if(ObjectUtil.isNotNull(param.getId())){ + //如果项目id为空。则查询所有 + }else { + //项目id不为空。查询单个项目 + + } + return null; + } + +// private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long startTime, +// Long endTime, Integer process, Integer priority) throws Exception { +// TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); +// +// List globalTaskList = new ArrayList<>(); +// List normalTaskList = new ArrayList<>(); +// TaskVo.GlobalTask globalTask; +// //获取“全体成员”角色 +// ProRole allMember = proRoleService.getAllMember(projectId); +// Long allMemberId = null; +// if (ObjectUtil.isNotNull(allMember)) { +// allMemberId = allMember.getId(); +// } +// +// //查找该项目下该用户的的所有的任务 +// List secondTaskVoList = +// List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, +// allMemberId, startTime, endTime, priority); +// +// if (CollectionUtil.isNotEmpty(secondTaskVoList)) { +// for (TaskVo.NormalTask normalTask : secondTaskVoList) { +// +// //任务完成状态 +// if (normalTask.getProcess() != 2) { +// ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); +// if (ObjectUtil.isNotNull(subTimeMember)) { +// normalTask.setProcess(subTimeMember.getComplatedStatus()); +// normalTask.setRealEndTime(subTimeMember.getRealFinishTime()); +// } else if (normalTask.getProcess() > 2) { +// normalTask.setRealEndTime((long) 0); +// normalTask.setProcess(0); +// } +// } +// } +// +// TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process); +// +// if (CollectionUtil.isNotEmpty(task.getGlobalTask())) { +// for (TaskVo.NormalTask global : task.getGlobalTask()) { +// globalTask = new TaskVo.GlobalTask(); +// BeanUtil.copyProperties(global, globalTask); +// globalTaskList.add(globalTask); +// } +// } +// if (CollectionUtil.isNotEmpty(task.getCommonTask())) { +// if (priority == 0) { +// normalTaskList = sortTaskTime(task.getCommonTask()); +// } else { +// normalTaskList = task.getCommonTask(); +// } +// } +// +// } +// +// proTaskInfo.setGlobalTaskList(globalTaskList); +// proTaskInfo.setNormalTaskList(normalTaskList); +// +// return proTaskInfo; +// } + +} diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 2a03ab40..6e578005 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -227,14 +227,12 @@ public enum CodeEnum { return this; } public CodeEnum addMsg(String msg){ + if(this.msg.contains("行:")){ + this.msg = this.msg.substring(this.msg.indexOf("行:") + 2); + } this.msg = msg+"行:"+this.msg; return this; } - public CodeEnum notProject(String msg) { - this.msg = msg + "找不到项目信息"; - return this; - } - public CodeEnum addMsgLwb(String msg) { this.msg = "未找到名为“"+msg+"”的列,请检查列名称是否正确"; return this;