From c39779fbbbb5358e120e5482bffeac1e51a1711d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 26 Nov 2024 16:46:19 +0800 Subject: [PATCH] 'commit' --- .../dsideal/QingLong/Gtzz/Controller/GtzzController.java | 4 ++-- .../java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java | 3 ++- src/main/resources/Sql/gtzz.sql | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java index ae2a391f..c5544f34 100644 --- a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java +++ b/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 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 p = gm.getJzList(SessionKit.get(getRequest(), getResponse(), "org_code"),data_type, is_finish_flag, page, limit); renderJson(CommonUtil.renderJsonForLayUI(p)); } diff --git a/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java b/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java index 9ad73289..ba250758 100644 --- a/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java +++ b/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java @@ -2501,9 +2501,10 @@ public class GtzzModel { * @param page 第几页 * @param limit 每页多少条 */ - public Page getJzList(String org_code, int is_finish_flag, int page, int limit) { + public Page 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); } diff --git a/src/main/resources/Sql/gtzz.sql b/src/main/resources/Sql/gtzz.sql index 82eef34a..e203bf33 100644 --- a/src/main/resources/Sql/gtzz.sql +++ b/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,