From 9f70b4cd6ed949e09451bb4ac629fb37063c9270 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 2 Jul 2018 16:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E7=B1=BB=E3=80=81?= =?UTF-8?q?=E6=80=A7=E8=B4=A8=E3=80=81=E6=A0=87=E7=AD=BE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=8F=AA=E6=9F=A5=E8=AF=A2=E9=9D=9E=E5=8F=B6=E5=AD=90=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../basics/ServiceDictInfoController.java | 23 ++++++++++++++++--- .../web/dao/basics/ServiceDictInfoDao.java | 4 ++-- .../nis/web/dao/basics/ServiceDictInfoDao.xml | 12 +++++++--- .../basics/ServiceDictInfoService.java | 12 +++++----- .../webapp/WEB-INF/include/form/basicInfo.jsp | 6 ++--- .../WEB-INF/views/basics/serviceDictForm.jsp | 2 +- .../WEB-INF/views/sys/tagTreeselect.jsp | 4 ++-- 7 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index de57edfb1..351396a5e 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.basics; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -192,11 +193,13 @@ public class ServiceDictInfoController extends BaseController { * @param extId * @param isShowHidden * @param response + * @param isShowLeaf是否查询叶子节点 * @return */ @ResponseBody @RequestMapping(value = "treeData") - public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) { + public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) boolean isShowLeaf, + @RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) { List> mapList = Lists.newArrayList(); Map map2 = Maps.newHashMap(); map2.put("id", 0); @@ -204,8 +207,22 @@ public class ServiceDictInfoController extends BaseController { map2.put("name","root_node"); //map2.put("placeholder","0"); mapList.add(map2); - //找出该类型所有的非叶子配置 - List list = serviceDictInfoService.findAllNoLeafDictList(itType); + List list = new ArrayList(); + + if(isShowLeaf){ + if(itType.equals("1")){ + list = serviceDictInfoService.findFlDict(); + }else if(itType.equals("2")){ + list = serviceDictInfoService.findXzDict(); + }else{ + list = serviceDictInfoService.findLableDict(); + } + + }else{ + //找出该类型所有的非叶子配置 + list = serviceDictInfoService.findAllNoLeafDictList(itType); + } + for (int i=0; i { - List findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid); - List findAllItemDict(@Param("itemType")int itemType); + List findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid,@Param("isLeaf")Integer isLeaf); + List findAllItemDictByItemType(@Param("itemType")int itemType,@Param("isLeaf")Integer isLeaf); diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml index 2e29ff8b1..356c031e8 100644 --- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml @@ -289,12 +289,18 @@ - select - from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType}; + from service_dict_info s where s.item_type=#{itemType} + + and s.is_leaf = #{isLeaf,jdbcType=INTEGER}, + diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java index 646739048..f42ed13fb 100644 --- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java @@ -224,7 +224,7 @@ public class ServiceDictInfoService extends BaseService{ * @since 1.0.0 */ public List findFlDict() { - return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_FL,Constants.VALID_YES); + return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_FL,Constants.VALID_YES,null); } /** * @@ -236,7 +236,7 @@ public class ServiceDictInfoService extends BaseService{ * @since 1.0.0 */ public List findAllFlDict() { - return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_FL); + return serviceDictInfoDao.findAllItemDictByItemType(Constants.ITEM_TYPE_FL,null); } /** * @@ -248,7 +248,7 @@ public class ServiceDictInfoService extends BaseService{ * @since 1.0.0 */ public List findXzDict() { - return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_XZ,Constants.VALID_YES); + return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_XZ,Constants.VALID_YES,null); } /** * @@ -260,7 +260,7 @@ public class ServiceDictInfoService extends BaseService{ * @since 1.0.0 */ public List findAllXzDict() { - return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_XZ); + return serviceDictInfoDao.findAllItemDictByItemType(Constants.ITEM_TYPE_XZ,null); } /** * @@ -272,7 +272,7 @@ public class ServiceDictInfoService extends BaseService{ * @since 1.0.0 */ public List findLableDict() { - return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_LABEL,Constants.VALID_YES); + return serviceDictInfoDao.findItemDict(Constants.ITEM_TYPE_LABEL,Constants.VALID_YES,null); } /** @@ -285,7 +285,7 @@ public class ServiceDictInfoService extends BaseService{ * @since 1.0.0 */ public List findAllLableDict() { - return serviceDictInfoDao.findAllItemDict(Constants.ITEM_TYPE_LABEL); + return serviceDictInfoDao.findAllItemDictByItemType(Constants.ITEM_TYPE_LABEL,null); } diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 08e4040e5..85097cf7c 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -39,7 +39,7 @@ <%-- > @@ -134,7 +134,7 @@ <%--