'commit'

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

@@ -1028,8 +1028,8 @@ public class GtzzController extends Controller {
 
     @Before({GET.class})
     @IsLoginInterface({})
-    public void getJzList(int is_finish_flag, int page, int limit) {
-        Page<Record> p = gm.getJzList(SessionKit.get(getRequest(), getResponse(), "org_code"), is_finish_flag, page, limit);
+    public void getJzList(int is_finish_flag,int data_type, int page, int limit) {
+        Page<Record> p = gm.getJzList(SessionKit.get(getRequest(), getResponse(), "org_code"),data_type, is_finish_flag, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(p));
     }
 

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

@@ -2501,9 +2501,10 @@ public class GtzzModel {
      * @param page           第几页
      * @param limit          每页多少条
      */
-    public Page<Record> getJzList(String org_code, int is_finish_flag, int page, int limit) {
+    public Page<Record> getJzList(String org_code, int data_type,int is_finish_flag, int page, int limit) {
         Kv kv = Kv.by("org_code", org_code);
         kv.set("is_finish_flag", is_finish_flag);
+        if(data_type>=0) kv.set("data_type",data_type);
         SqlPara sp = Db.getSqlPara("Gtzz.getJzList", kv);
         return Db.paginate(page, limit, sp);
     }

src/main/resources/Sql/gtzz.sql

@@ -403,7 +403,11 @@
             subject_id,org_code,org_name,subject_name,subject_type_id,subject_type_name,
             year,step_code,step_name,begin_time,end_time,action_bureau,input_value,radio_id,
             is_current,is_back_log,is_finish_flag,check_status,lixiang_time,bxlx_name,cxlx_name,
-            jsfa_type_id,task_number,data_type,is_finish_time from t_gtzz_progress where org_code='#(org_code)'
+            jsfa_type_id,task_number,data_type,is_finish_time from t_gtzz_progress where
+            org_code='#(org_code)'
+            #if(data_type)
+                and data_type=#(data_type)
+            #end
             and is_finish_flag=#(is_finish_flag)
             group by subject_id,org_code,org_name,subject_name,subject_type_id,subject_type_name,
                 year,step_code,step_name,begin_time,end_time,action_bureau,input_value,radio_id,