diff --git a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java index fb3c5aa..834fa90 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java @@ -48,6 +48,13 @@ public class ProjectInitListener implements ExecutionListener { ProjectInfo projectInfo = projectInfoService.selectOne(wrapper); if (!ObjectUtils.isEmpty(projectInfo)) { JSONObject ext = projectInfo.getExt(); + + //研究开发类/自主研发类没有填报直接结项 + String openRange = String.valueOf(ext.get("openRange")); + if("3".equals(openRange) || "7".equals(openRange)){ + return; + } + //根据部门批量添加部门周报填报 JSONArray depts = (JSONArray) ext.get("executeDepts"); ArrayList weeklyArrayList = new ArrayList<>();