From 4f0c48f224f149b0c9eec743383eb5be3054a889 Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Tue, 31 Mar 2020 19:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.yml | 4 + .../mybatis/mapper/check/check-mapper.xml | 4 + .../gridpersonnel/gridpersonnel-mapper.xml | 6 + .../static/route/check/list-check-admin.html | 295 ++++++++++++++++++ .../static/route/check/list-check-mine.html | 295 ++++++++++++++++++ .../static/route/check/list-check.html | 7 - 6 files changed, 604 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/static/route/check/list-check-admin.html create mode 100644 src/main/resources/static/route/check/list-check-mine.html diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 1306341..6734bc6 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -105,6 +105,10 @@ access-control: - /default.html - /assets/** - /route/file/downloadfile/** + - /api/file/uploadfile + - /api/file/uploadimage + - /api/file/uploadvideo + - /api/file/uploadaudio save-paths: - /**/save*/** - /**/add*/** diff --git a/src/main/resources/mybatis/mapper/check/check-mapper.xml b/src/main/resources/mybatis/mapper/check/check-mapper.xml index 30cf521..3c1c464 100644 --- a/src/main/resources/mybatis/mapper/check/check-mapper.xml +++ b/src/main/resources/mybatis/mapper/check/check-mapper.xml @@ -200,6 +200,10 @@ #{checkIds[${index}]} + + AND + t1.creator = #{creator} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml index 0199d44..594e42b 100644 --- a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml +++ b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml @@ -214,6 +214,10 @@ #{gridPersonnelIds[${index}]} + + AND + t1.user_id LIKE CONCAT(#{keywords}, '%') + AND t1.level = #{level} @@ -238,6 +242,8 @@ AND t1.area5 = #{area5} + ORDER BY + t1.level ASC \ No newline at end of file diff --git a/src/main/resources/static/route/check/list-check-admin.html b/src/main/resources/static/route/check/list-check-admin.html new file mode 100644 index 0000000..85b9ee9 --- /dev/null +++ b/src/main/resources/static/route/check/list-check-admin.html @@ -0,0 +1,295 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/check/list-check-mine.html b/src/main/resources/static/route/check/list-check-mine.html new file mode 100644 index 0000000..85b9ee9 --- /dev/null +++ b/src/main/resources/static/route/check/list-check-mine.html @@ -0,0 +1,295 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/check/list-check.html b/src/main/resources/static/route/check/list-check.html index 85b9ee9..a17c7be 100644 --- a/src/main/resources/static/route/check/list-check.html +++ b/src/main/resources/static/route/check/list-check.html @@ -31,12 +31,6 @@ - - @@ -78,7 +72,6 @@ }, cols: [[ {type:'checkbox', fixed: 'left'}, - {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, {field: 'nameJoinByEnterpriseId', width: 200, title: '企业名称', align:'center', templet: function(row) { var rowData = row[this.field];