diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java index c3d215c8..86b0f7c1 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java @@ -101,7 +101,7 @@ public class InputDocVo { private List fileList; @ApiModelProperty("备注") private String remark; - @ApiModelProperty("操作类型(0-上传,1-修改,2-删除,3-通过,4-驳回,5-添加[添加备注])") + @ApiModelProperty("操作类型(0-上传,1-修改,2-删除,3-通过,4-驳回,5-添加[添加备注]),6-删除输入文档下所有文件)") private Byte doType; @JsonFormat(pattern="MM.dd/HH:mm",timezone="GMT+8") @ApiModelProperty("记录创建时间") 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 4946f2af..592731e8 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -988,17 +988,23 @@ public class ExcelService implements IExcelService { } //没有开始时间默认项目开始时间 - if (StrUtil.isNotEmpty(beginTime)) { - taskDetail.setBeginTime(Long.valueOf(beginTime)); - } else { - taskDetail.setBeginTime(sysProject.getBeginTime()); - } - //没有结束时间默认项目结束时间 - if (StrUtil.isNotEmpty(endTime)) { - taskDetail.setEndTime(Long.valueOf(endTime)); - } else { - taskDetail.setEndTime(sysProject.getEndTime()); + try { + if (StrUtil.isNotEmpty(beginTime)) { + taskDetail.setBeginTime(Long.valueOf(beginTime)); + } else { + taskDetail.setBeginTime(sysProject.getBeginTime()); + } + //没有结束时间默认项目结束时间 + if (StrUtil.isNotEmpty(endTime)) { + taskDetail.setEndTime(Long.valueOf(endTime)); + } else { + taskDetail.setEndTime(sysProject.getEndTime()); + } + }catch (Exception e){ + //日期格式错误 + throw new BaseException(CodeEnum.WBS_PROJECT_TIME_ERROR.addMsg(wbsSheet.getSheetName(),i + 1)); } + //重复频率 if (StrUtil.isNotEmpty(repeat)) { taskDetail.setCycle(repeat); @@ -1320,10 +1326,11 @@ public class ExcelService implements IExcelService { taskId = proTask.getId(); break; } - }else { - throw new BaseException(CodeEnum.NOT_TASK.addMsg(sheet.getSheetName(),(i+1),task)); } } + if(taskId == null){ + throw new BaseException(CodeEnum.NOT_TASK.addMsg(sheet.getSheetName(),(i+1),task)); + } } for (int a = 2; a < roleRow.getLastCellNum(); a++) { 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 968db5a3..ec69d330 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -664,8 +664,7 @@ public class InputDocService implements IInputDocService { @Override public PageInfo viewDeliverHistory(InputDocDto.DeliverHistory param) { //0为输出文档 - if (0 == param.getDeliverType()) - { + if (0 == param.getDeliverType()) { PageHelper.startPage(param.getPageNum(), param.getPageSize()); List historyList = deliverHistoryRecordDao.findInputHistory(param.getDeliverId()); for (InputDocVo.DeliverHistory deliverHistory : historyList) { diff --git a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java index e9280622..8986492e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/LwbsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/LwbsService.java @@ -83,7 +83,7 @@ public class LwbsService implements ILwbsService{ globalTask.setId(project.getId()); globalTask.setName(project.getName()); globalTask.setProjectId(project.getId()); - globalTask.setName(project.getName()); + globalTask.setProjectName(project.getName()); globalTask.setBeginTime(project.getBeginTime()); globalTask.setEndTime(project.getEndTime()); globalTask.setNormalTaskList(projectTask.getGlobalTaskList()); @@ -95,7 +95,7 @@ public class LwbsService implements ILwbsService{ normalTask.setId(project.getId()); normalTask.setName(project.getName()); normalTask.setProjectId(project.getId()); - normalTask.setName(project.getName()); + normalTask.setProjectName(project.getName()); normalTask.setBeginTime(project.getBeginTime()); normalTask.setEndTime(project.getEndTime()); normalTask.setSecondTasks(projectTask.getNormalTaskList()); diff --git a/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml b/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml index d574cec8..6936cc95 100644 --- a/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml +++ b/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml @@ -17,11 +17,12 @@ pdhr.history_remark AS historyRemark FROM t_pro_deliver_history_record AS pdhr - LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id - LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id - LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id + LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id and pr.rec_status = 0 + LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id and ptir.rec_status = 0 + LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id and pm.rec_status = 0 WHERE pdhr.deliver_id = #{deliverId} + and pdhr.rec_status = 0 \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index 26587146..46c7d388 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -586,6 +586,7 @@ + @@ -629,6 +630,7 @@ s.id as tSubTimeId, d.name as tName, d.project_id as tProjectId, + (select name from t_sys_project where id = #{projectId}) as projectName, d.description as tDescription, d.executor_role as tExecutorRole, s.begin_time as tBeginTime, @@ -670,6 +672,7 @@ s.id as tSubTimeId, d.name as tName, d.project_id as tProjectId, + (select name from t_sys_project where id = #{projectId}) as projectName, d.description as tDescription, d.executor_role as tExecutorRole, s.begin_time as tBeginTime,