From ba864992602fec6b187cefb5217d3de77ce7125b Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Wed, 14 Apr 2021 16:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BA=93=E6=96=B0=E5=A2=9Ewe?=
 =?UTF-8?q?b=E9=A1=B5=E9=9D=A2=E6=A0=91=E5=BD=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/indexlib/IndexLibController.java      | 26 +++++++++++++------
 .../mapper/indexLib/indexLib-mapper.xml       |  3 +++
 .../route/basicCheckPersonInfo/save.html      |  8 +++---
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java b/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java
index cc2e217..ec8843d 100644
--- a/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java
+++ b/src/main/java/com/tenlion/twoduty/controller/api/indexlib/IndexLibController.java
@@ -48,8 +48,6 @@ public class IndexLibController extends DefaultBaseController {
         return indexLibService.listWebTags(params);
     }
 
-
-
     @ApiOperation(value = "web页面指标库树形列表", notes = "web页面指标库树形列表接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("listztreeweb/{indexLibParentId}")
@@ -64,6 +62,24 @@ public class IndexLibController extends DefaultBaseController {
     }
 
 
+    @ApiOperation(value = "web分页列表", notes = "web分页列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpageweb/{indexLibParentId}")
+    public SuccessResultList<List<IndexLibDTO>> listPageWeb(@PathVariable("indexLibParentId") String indexLibParentId,ListPage page) {
+        Map<String, Object> params = requestParams();
+        params.put("indexLibParentId",indexLibParentId == null ? 0:indexLibParentId);
+        params.put("indexLibState",1);
+        page.setParams(params);
+        return indexLibService.listPage(page);
+    }
+
 
 
     @ApiOperation(value = "修改指标状态", notes = "修改指标状态接口")
@@ -81,8 +97,6 @@ public class IndexLibController extends DefaultBaseController {
         return new SuccessResult();
     }
 
-
-
     @ApiOperation(value = "指标库树形列表", notes = "指标库树形列表接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("listztree")
@@ -96,10 +110,6 @@ public class IndexLibController extends DefaultBaseController {
         return indexLibService.listZTree(params);
     }
 
-
-
-
-
     @ApiOperation(value = "新增", notes = "新增接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @PostMapping("save")
diff --git a/src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml b/src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml
index 1d0a788..f51e175 100644
--- a/src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml
+++ b/src/main/resources/mybatis/mapper/indexLib/indexLib-mapper.xml
@@ -323,6 +323,9 @@
         <if test="indexLibParentId != null and indexLibParentId != ''">
             AND t1.index_lib_parent_id = #{indexLibParentId}
         </if>
+        <if test="indexLibState != null and indexLibState != ''">
+            AND t1.index_lib_state = #{indexLibState}
+        </if>
         ORDER BY  t1.index_lib_sort
     </select>
 
diff --git a/src/main/resources/static/route/basicCheckPersonInfo/save.html b/src/main/resources/static/route/basicCheckPersonInfo/save.html
index 3169af3..485e8db 100644
--- a/src/main/resources/static/route/basicCheckPersonInfo/save.html
+++ b/src/main/resources/static/route/basicCheckPersonInfo/save.html
@@ -282,7 +282,7 @@
 
         // 初始化内容
         function initData() {
-            var loadLayerIndex;
+            //var loadLayerIndex;
             top.restAjax.get(top.restAjax.path('api/indexlib/get/{indexLibId}', [indexLibId]), {}, null, function(code, data) {
                 var dataFormData = {};
                 dataFormData['dutyIndexLibId'] = data.indexLibId;
@@ -296,11 +296,11 @@
                 initNationTemplate();
                 initEducationTemplate();
             }, function(code, data) {
-                top.dialog.msg(data.msg);
+                //top.dialog.msg(data.msg);
             }, function() {
-                loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
+                //loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3});
             }, function() {
-                top.dialog.close(loadLayerIndex);
+                //top.dialog.close(loadLayerIndex);
             });