'commit'

src/main/java/Tools/DataEase/TestRead.java

@@ -1,9 +1,6 @@
 package Tools.DataEase;
 
 
-import org.htmlunit.*;
-import org.htmlunit.html.HtmlElement;
-import org.htmlunit.html.HtmlPage;
 
 import java.io.IOException;
 

src/main/java/Tools/FillSubject.java

@@ -7,10 +7,13 @@ import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
+import com.dsideal.QingLong.Const.CheckConst;
 import com.dsideal.QingLong.Const.GtzzConst;
+import com.dsideal.QingLong.Const.StepConst;
 import com.dsideal.QingLong.Gtzz.Model.GtzzModel;
 import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Util.PgSqlUtil;
+import com.jfinal.kit.Kv;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.CaseInsensitiveContainerFactory;
@@ -114,7 +117,6 @@ public class FillSubject {
     }
 
 
-
     /**
      * 功能：下载JSON文件，并酌情写入到数据库
      *
@@ -331,7 +333,7 @@ public class FillSubject {
             r.set("subject_type_name", subject_type_name);
             r.set("year", record.getInt("sbnd"));
             r.set("step_code", "0201");
-            r.set("step_name", "项目分配(评审专家)");
+            r.set("step_name", "初审专家分配");
             r.set("is_current", 1);
             //设置为空值
             r.set("end_time", null);
@@ -353,8 +355,18 @@ public class FillSubject {
             int subject_id = record.getInt("subject_id");
             subject_ids = subject_ids + subject_id + ",";
             //将专家黄海设置为此项目的专家
-            if (ZhuanJiaCheck) {
+            if (!ZhuanJiaCheck) {
+                //生成下一条流水记录
+                List<Record> l1 = gm.getSubjectProgress(subject_id);
+                int progress_id = l1.get(l1.size() - 1).getInt("progress_id");
+                List<Record> l2 = gm.getSubjectProgress(subject_id);
+                Record r = l2.get(l2.size() - 1);
+                gm.updateCheckStatus(r, StepConst.IS_FINISH, CheckConst.WAIT, "",
+                        null, "", "", 0, -1);
+                gm.passGetNextProgress(progress_id, gm.getSubjectInfo(subject_id).getStr("org_code"), "", 0);
                 gm.saveSubjectExpert(subject_id, "0203", GtzzConst.DEFAULT_EXPERT, GtzzConst.DEFAULT_EXPERT);
+                //清除缓存
+                gm.delTjCache();
                 System.out.println("设置默认专家为黄海：" + subject_id);
             }
             //标识此项目已经被扫描进入正式系统表中
@@ -362,7 +374,7 @@ public class FillSubject {
             Db.update(sql, subject_id);
         }
         //如果需要进行专家审核，那么把这些项目统统放到默认的ys_id=1的任务中去，ys_id=1是所有不需要专家审核的默认任务载体
-        if (ZhuanJiaCheck) {
+        if (!ZhuanJiaCheck) {
             subject_ids = subject_ids.substring(0, subject_ids.length() - 1);
             gm.saveYsSubject(1, subject_ids);
             System.out.println("设置项目为ys_id=1任务所辖的项目");

src/main/java/com/dsideal/QingLong/Gtzz/Controller/ExpertController.java

@@ -69,10 +69,10 @@ public class ExpertController extends Controller {
     public void saveSubjectExpert(int subject_id, String step_code, String person_ids, String master_id) {
         //检查是不是以前存在过专家记录，是不是生成过下级流水ID
         List<Record> list = gm.getSubjectExpert(subject_id, step_code, -1);
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             //生成下一条流水记录
             List<Record> l1 = gm.getSubjectProgress(subject_id);
-            if (l1.size() == 0) {
+            if (l1.isEmpty()) {
                 Kv kv = Kv.by("success", false);
                 kv.set("message", "输入的subject_id有误,请检查后重新输入！");
                 renderJson(kv);