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

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -654,8 +654,7 @@ public class CollectModel {
         kv.set("publish_role_id", publish_role_id);
         if (!StrKit.isBlank(job_name)) kv.set("job_name", job_name);
         SqlPara sqlPara = Db.getSqlPara("Collect.getJobList", kv);
-        String sql = sqlPara.getSql();
-        Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
+        Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
 
         for (Record record : pageRecord.getList()) {
             if (record.getInt("job_type") == 1) record.set("job_type_name", "表单");
@@ -753,8 +752,7 @@ public class CollectModel {
         if (!StrKit.isBlank(city_id)) kv.set("city_id", city_id);
         if (!StrKit.isBlank(area_id)) kv.set("area_id", area_id);
         SqlPara sqlPara = Db.getSqlPara("Collect.getBureauList", kv);
-        String sql = sqlPara.getSql();
-        Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
+        Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
     }
 
@@ -904,8 +902,7 @@ public class CollectModel {
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         if (is_finish != -1) kv.set("is_finish", is_finish);
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
-        String sql = sqlPara.getSql();
-        Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
+        Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
     }
 
@@ -924,8 +921,7 @@ public class CollectModel {
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         if (is_finish != -1) kv.set("is_finish", is_finish);
         SqlPara sqlPara = Db.getSqlPara("Collect.listFilledJob", kv);
-        String sql = sqlPara.getSql();
-        Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
+        Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
     }
 

src/main/resource/Sql/collect.sql

@@ -4,9 +4,9 @@
         select t1.*,
         (select count(1) from t_collect_job_bureau as t2 where t2.job_id=t1.job_id and t2.is_finish=1) as finish_count,
         (select count(1) from t_collect_job_bureau as t2 where t2.job_id=t1.job_id ) as total_count
-        from t_collect_job as t1 where publish_role_id = #(publish_role_id)
+        from t_collect_job as t1 where publish_role_id = #para(publish_role_id)
         #if(job_name)
-            and t1.job_name like '#(job_name, "like")'
+            and t1.job_name like #para(job_name, "like")
         #end
         order by t1.job_id desc
     #end
@@ -36,25 +36,25 @@
             and school_type_id =#(school_type_id)
         #end
         #if(level_id)
-            and level_id='#(level_id)'
+            and level_id=#para(level_id)
         #end
         #if(city_id)
-            and city_id='#(city_id)'
+            and city_id=#para(city_id)
         #end
         #if(area_id)
-            and area_id='#(area_id)'
+            and area_id=#para(area_id)
         #end
         order by org_name
     #end
     -- 任务列表
     #sql("viewJobList")
         select * from t_collect_job as t1 inner join t_collect_job_bureau as t2 on t1.job_id=t2.job_id
-        where t2.bureau_id = '#(bureau_id)'
+        where t2.bureau_id = #para(bureau_id)
         #if(is_finish)
-         and t2.is_finish= #(is_finish)
+         and t2.is_finish= #para(is_finish)
         #end
         #if(keyword)
-         and t1.job_name like '#(keyword, "like")'
+         and t1.job_name like #para(keyword, "like")
         #end
         order by create_time desc
     #end
@@ -62,17 +62,17 @@
     #sql("listFilledJob")
         select t1.*,t2.org_name as bureau_name from t_collect_job_bureau as t1
         inner join t_base_organization as t2 on t1.bureau_id=t2.org_id
-        where t1.job_id=#(job_id)
+        where t1.job_id=#para(job_id)
         #if(is_finish)
-          and t1.is_finish=#(is_finish)
+          and t1.is_finish=#para(is_finish)
         #end
         #if(keyword)
-         and t2.org_name like '#(keyword, "like")'
+         and t2.org_name like #para(keyword, "like")
         #end
     #end
     -- 获取组内单位ids
     #sql("getGroup")
      select org_id as bureau_id,org_name as bureau_name from
-     t_base_organization where org_id in '#(idList, "in")'
+     t_base_organization where org_id in #para(idList, "in")
     #end
 #end