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 249fcc14..710fac62 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -664,54 +664,134 @@ public class ExcelService implements IExcelService { if(ObjectUtil.isNull(row)){ continue; } + String task1="",task2="",description="",beginTime="",endTime="",label="",repeat="",subTaskCell="",subProject="",inputFiles=""; + String deliver="",executorRole="",checkerRole="",money="",delay="",delayTime="",loopTo="",loopTimes="",input=""; + if(map.get("任务(节点)")!=null){ //一级任务名称 - String task1 = ExcelUtil.getCellValue(row.getCell(map.get("任务(节点)"))); + task1 = ExcelUtil.getCellValue(row.getCell(map.get("任务(节点)"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("任务(节点)")); + } + if(map.get("二级任务(节点)")!=null){ //二级任务名称 - String task2 = ExcelUtil.getCellValue(row.getCell(map.get("二级任务(节点)"))); + task2 = ExcelUtil.getCellValue(row.getCell(map.get("二级任务(节点)"))); //详情 - String description = ExcelUtil.getCellValue(row.getCell(map.get("任务描述/要求"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("二级任务(节点)")); + } + if(map.get("任务描述/要求")!=null){ + description = ExcelUtil.getCellValue(row.getCell(map.get("任务描述/要求"))); //开始时间 - String beginTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("开始时间")))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("任务描述/要求")); + } + if(map.get("开始时间")!=null){ + beginTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("开始时间")))); //结束时间 - String endTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("结束时间")))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("开始时间")); + } + if(map.get("结束时间")!=null){ + endTime = StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("结束时间")))); //标签 - String label=StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("标签")))); - + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("结束时间")); + } + if(map.get("标签")!=null){ + label=StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("标签")))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("标签")); + } //重复 - String repeat = ExcelUtil.getCellValue(row.getCell(map.get("重复"))); + if(map.get("重复")!=null){ + repeat = ExcelUtil.getCellValue(row.getCell(map.get("重复"))); + + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("重复")); + } //关联子日程表 - String subTaskCell = ExcelUtil.getCellValue(row.getCell(map.get("关联子日程表"))); + if(map.get("关联子日程表")!=null){ + subTaskCell = ExcelUtil.getCellValue(row.getCell(map.get("关联子日程表"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("关联子日程表")); + } //关联子项目表 - String subProject = ExcelUtil.getCellValue(row.getCell(map.get("关联子项目表"))); + if(map.get("关联子项目表")!=null){ + subProject = ExcelUtil.getCellValue(row.getCell(map.get("关联子项目表"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("关联子项目表")); + } //输入文档 - String inputFiles=StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("输入文档")))); + if(map.get("输入文档")!=null){ + inputFiles=StringUtil.replaceStrSpace(ExcelUtil.getCellValue(row.getCell(map.get("输入文档")))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("输入文档")); + } //交付物 - String deliver = ExcelUtil.getCellValue(row.getCell(map.get("交付物/MVP项"))); + if(map.get("交付物/MVP项")!=null){ + deliver = ExcelUtil.getCellValue(row.getCell(map.get("交付物/MVP项"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("交付物/MVP项")); + } //负责人 - String executorRole = ExcelUtil.getCellValue(row.getCell(map.get("负责人"))); + if(map.get("负责人")!=null){ + executorRole = ExcelUtil.getCellValue(row.getCell(map.get("负责人"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("负责人")); + } //检查人 - String checkerRole = ExcelUtil.getCellValue(row.getCell(map.get("检查人"))); + if(map.get("检查人")!=null){ + checkerRole = ExcelUtil.getCellValue(row.getCell(map.get("检查人"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("检查人")); + } //即时奖惩(元) - String money = ExcelUtil.getCellValue(row.getCell(map.get("即时奖惩(元)"))); + if(map.get("即时奖惩(元)")!=null){ + money = ExcelUtil.getCellValue(row.getCell(map.get("即时奖惩(元)"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("即时奖惩(元)")); + } //任务切换模式 - String delay = ExcelUtil.getCellValue(row.getCell(map.get("任务切换模式"))); + if(map.get("任务切换模式")!=null){ + delay = ExcelUtil.getCellValue(row.getCell(map.get("任务切换模式"))); + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("任务切换模式")); + } //延迟时间 //(自动延迟模式可用) - String delayTime = ExcelUtil.getCellValue(row.getCell(map.get("延迟时间(自动延迟模式可用)"))); + if(map.get("延迟时间(自动延迟模式可用)")!=null){ + delayTime = ExcelUtil.getCellValue(row.getCell(map.get("延迟时间(自动延迟模式可用)"))); //TODO 跳转任务和跳转次数暂不处理 + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("延迟时间(自动延迟模式可用)")); + } //跳转任务 - String loopTo = ExcelUtil.getCellValue(row.getCell(16)); + if(map.get("任务(节点)")!=null){ + loopTo = ExcelUtil.getCellValue(row.getCell(16)); + + }else { +// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); + } //跳转次数 - String loopTimes = ExcelUtil.getCellValue(row.getCell(17)); + if(map.get("任务(节点)")!=null){ + loopTimes = ExcelUtil.getCellValue(row.getCell(17)); //这个不知道要不要先给你留着 + }else { + throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); + } //输入文件 - String input = ExcelUtil.getCellValue(row.getCell(18)); + if(map.get("任务(节点)")!=null){ + input = ExcelUtil.getCellValue(row.getCell(18)); //二级任务名不能为空 // if(StrUtil.isEmpty(task2)){ // throw new BaseException(CodeEnum.WBS_NOT_TASK_NAME.addMsg(wbsSheet.getSheetName()+i)); // } //一级任务 + }else { +// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); + } + if (StrUtil.isNotEmpty(task1)) { ProTaskDetail firstTaskDetail = new ProTaskDetail(); firstTaskDetail.setId(snowflake.nextId()); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 67dfd654..7d11ccf4 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -82,6 +82,7 @@ public class ProRoleService implements IProRoleService { List memberRoleList; //获取用户在项目中的角色 List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId, imitation); + //1.查询二级角色(项目经理+项目成员+mvp) memberRoleList = getRealMemberRolesByProjectId(projectId); diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index e75cc2c3..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: util-prod,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 9c9979e2..5e823994 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -187,6 +187,7 @@ public enum CodeEnum { MEIYOUGAIYISHENG(156,"该医生信息查询不正确",true), QINGTIJIAOSHITI(157,"未做出修改答案,修改后再提交",true), DOC_REPEAT(158,"输入文档已存在",true), + NOTNAME(159,"未找到该列",true), ; @@ -218,6 +219,10 @@ public enum CodeEnum { this.msg = msg+"行:"+this.msg; return this; } + public CodeEnum addMsgLwb(String msg) { + this.msg = "未找到名为“"+msg+"”的列,请检查列名称是否正确"; + return this; + } public static CodeEnum getByCode(int code) { for (CodeEnum codeEnum: CodeEnum.values()) { if (codeEnum.getCode() == code) {