Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Gtzz/Model/RefreshTjWorker.java

@@ -4,6 +4,6 @@ public class RefreshTjWorker extends Thread{
     //线程一直执行
     public void run() {
         RefreshTj myclient=new RefreshTj();
-        //myclient.run();
+        myclient.run();
     }
 }

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -318,7 +318,7 @@ public class ZbdcModel {
             c = c.substring(0, c.length() - 4);
         }
 
-        String sqlExceptSelect= "from t_zbdc_templet where km_code='" + km_code + "'";
+        String sqlExceptSelect = "from t_zbdc_templet where km_code='" + km_code + "'";
         if (!StrKit.isBlank(c)) sqlExceptSelect += c;
         sqlExceptSelect += " order by templet_id";
         Page<Record> list = Db.paginate(page, limit, "select *", sqlExceptSelect);
@@ -338,6 +338,27 @@ public class ZbdcModel {
                 record.set("xysl", 0);
             }
         }
+        //再做一下处理，类型四合一，必配+选配返回1或0
+        for (Record record : list.getList()) {
+            String level_1 = record.getStr("level_1");
+            String level_2 = record.getStr("level_2");
+            String level_3 = record.getStr("level_3");
+            String level_4 = record.getStr("level_4");
+            String level = level_1;
+            if (!StrKit.isBlank(level_2)) {
+                level += "/" + level_2;
+                if (!StrKit.isBlank(level_3)) {
+                    level += "/" + level_3;
+                    if (!StrKit.isBlank(level_4)) {
+                        level += "/" + level_4;
+                    }
+                }
+            }
+            record.set("level", level);
+            //必配或选配
+            if (!StrKit.isBlank(record.getStr("bp"))) record.set("bp_xp", 1);
+            else record.set("bp_xp", 0);
+        }
         return list;
     }