From 4877c9a38a90e2735681314cc40ef5ef6ec11e56 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Tue, 9 Jul 2024 13:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9:=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=88=AB=E4=B8=BA=E7=A0=94=E7=A9=B6=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E7=B1=BB/=E8=87=AA=E4=B8=BB=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8D=E5=8F=82=E4=B8=8E=20=E5=91=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=8F=8A=E5=AD=A3=E5=BA=A6=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xqopen/kehui/flows/util/ProjectInitListener.java   | 7 +++++++
 1 file changed, 7 insertions(+)

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<ProjectWeekly> weeklyArrayList = new ArrayList<>();