diff --git a/src/main/java/com/ccsens/ptccsens/service/ImportService.java b/src/main/java/com/ccsens/ptccsens/service/ImportService.java index 05d19f1..06cbe8c 100644 --- a/src/main/java/com/ccsens/ptccsens/service/ImportService.java +++ b/src/main/java/com/ccsens/ptccsens/service/ImportService.java @@ -782,7 +782,7 @@ public class ImportService implements IImportService { roleTask.setTaskId(taskDetail.getId()); roleTaskMapper.insertSelective(roleTask); }else { - throw new BaseException(BasicsCodeError.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName(),i+1,executorRole)); + throw new BaseException(BasicsCodeError.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName(),i+1,checkerRole)); } //处理时间、添加任务分解、添加任务标签 @@ -930,7 +930,7 @@ public class ImportService implements IImportService { // Long timeLabel = subLabelDao.getLabelByTypeAndLevel(0, 4); // saveLabelTask(taskDetailId,timeLabel); }catch (Exception e){ - Date startDate = new Date(project.getBeginTime()); + Date startDate = new Date(project.getBeginTime() - 1L); Date endDate = new Date(project.getEndTime()); try { List taskDateList = diff --git a/src/main/java/com/ccsens/ptccsens/service/TallService.java b/src/main/java/com/ccsens/ptccsens/service/TallService.java index 80f246b..53b90f9 100644 --- a/src/main/java/com/ccsens/ptccsens/service/TallService.java +++ b/src/main/java/com/ccsens/ptccsens/service/TallService.java @@ -759,12 +759,14 @@ public class TallService implements ITallService { //判断用户是否是项目经理 Integer power = powerService.queryUserPower(params.getProjectId(), user.getId()); if (power < 1) { - throw new BaseException(BasicsCodeError.NO_POWER); + throw new BaseException(BasicsCodeError.NO_POWER); } //TODO 删除项目 暂时只删除项目 ProTaskDetail project = new ProTaskDetail(); project.setId(params.getProjectId()); project.setRecStatus((byte) 2); taskDetailDao.updateByPrimaryKeySelective(project); + //删除任务 + //删除角色 } } diff --git a/src/main/resources/mapper_dao/PluDeliverDao.xml b/src/main/resources/mapper_dao/PluDeliverDao.xml index 58a2ee7..49e30d0 100644 --- a/src/main/resources/mapper_dao/PluDeliverDao.xml +++ b/src/main/resources/mapper_dao/PluDeliverDao.xml @@ -240,7 +240,7 @@ LEFT JOIN t_pro_member m on c.checker_id = m.id and m.rec_status = 0 WHERE c.deliver_record_id = #{deliverRecordId} - and c.rec_status = 0 + and cl.rec_status = 0 ORDER BY cl.time DESC \ No newline at end of file