'commit'

src/main/java/Tools/FillSubject.java

@@ -303,14 +303,6 @@ public class FillSubject {
             if (finish_scan == 0) {
                 c1 = c1 + 1;
                 CommonUtil.log("成功插入表t_gtzz_subject：" + c1 + "条记录！");
-                String install_area = "064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667";//长春市
-                //新增加的项目数据，需要根据全局变量ZhuanJiaCheck=1还是ZhuanJiaCheck=0，来决定是不是生成这个项目的评审专家和专家组组长
-                sql = "select global_value from t_base_global where install_area=? and global_code=?";
-                String global_value = Db.findFirst(sql, install_area, "ZhuanJiaCheck").getStr("global_value");
-                if (global_value.equals("1")) {
-                    //将专家黄海设置为此项目的专家
-                    gm.saveSubjectExpert(subject_id, "0203", GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT);
-                }
             } else {
                 c2 = c2 + 1;
                 CommonUtil.log("成功更新表t_gtzz_subject：" + c2 + "条记录！");
@@ -350,12 +342,35 @@ public class FillSubject {
             CommonUtil.log("正在生成项目记录，第" + cnt + "个，共" + list.size() + "个");
             cnt++;
         }
+
+        boolean ZhuanJiaCheck = false;
+        String install_area = GtzzConst.CHANGCHUAN;//长春市
+        //新增加的项目数据，需要根据全局变量ZhuanJiaCheck=1还是ZhuanJiaCheck=0，来决定是不是生成这个项目的评审专家和专家组组长
+        sql = "select global_value from t_base_global where install_area=? and global_code=?";
+        String global_value = Db.findFirst(sql, install_area, "ZhuanJiaCheck").getStr("global_value");
+        if (global_value.equals("1")) {
+            ZhuanJiaCheck = true;
+        }
+        String subject_ids = "";
         //4、修改为已扫描完成
         for (Record record : list) {
+            int subject_id = record.getInt("subject_id");
+            subject_ids = subject_ids + subject_id + ",";
+            //将专家黄海设置为此项目的专家
+            if (ZhuanJiaCheck) {
+                gm.saveSubjectExpert(subject_id, "0203", GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT);
+                System.out.println("设置默认专家为黄海：" + subject_id);
+            }
             sql = "update t_gtzz_subject set finish_scan=1 where subject_id=?";
-            Db.update(sql, record.getInt("subject_id"));
+            Db.update(sql, subject_id);
+        }
+        if (ZhuanJiaCheck) {
+            subject_ids = subject_ids.substring(0, subject_ids.length() - 1);
+            gm.saveYsSubject(1, subject_ids);
+            System.out.println("设置项目为ys_id=1任务所辖的项目");
         }
 
+
         // 5、数据准备
         // 更新项目主表,添加办学类型名称和城乡类型名称两列
         sql = "UPDATE t_gtzz_subject t1 SET bxlx_name = t2.bxlx_name,cxlx_name = t2.cxlx_name FROM t_gtzz_school t2 WHERE t1.org_code = t2.org_code";

src/main/java/com/dsideal/QingLong/Const/GtzzConst.java

@@ -3,4 +3,6 @@ package com.dsideal.QingLong.Const;
 public class GtzzConst {
     //默认专家唯一标识
     public static String DEFAULT_EXPERT = "4F4046D0-5B22-4EE6-BC95-6C7270313A42";
+
+    public static String CHANGCHUAN="064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667";
 }