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 7eadbff2c..96b451752 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -156,7 +156,7 @@ public class ServiceDictInfoController extends BaseController { for(int i=allList.size()-1;i>=0;i--){ ServiceDictInfo se = allList.get(i); if(se!=null&&se.getServiceDictId()!=null){ - if(tempList.contains(se.getServiceDictId())){ + if(tempList.contains(se.getServiceDictId())||se.getParent().getServiceDictId()==0){ allList.remove(se); } } @@ -164,7 +164,7 @@ public class ServiceDictInfoController extends BaseController { allList.addAll(page.getList()); ServiceDictInfo.sortList(list,allList,0,true); - + //serviceDictInfo.setItemType(selectedType); model.addAttribute("itType", itType); model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("list", list); diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index 72991d6fb..2a2f8d4df 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -155,7 +155,7 @@ public class SysDictInfoController extends BaseController { SysDictInfo se = allList.get(i); //System.out.println("删前顺序"+se.getSysDictId()); if(se!=null&&se.getSysDictId()!=null){ - if(tempList.contains(se.getSysDictId())){ + if(tempList.contains(se.getSysDictId())||se.getParent().getSysDictId()==0){ allList.remove(se); } } 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 6a319b3b7..db157fb9d 100644 --- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml @@ -84,7 +84,7 @@ AND create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND create_time <= #{endDate,jdbcType=TIMESTAMP} @@ -115,7 +115,7 @@ AND create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND create_time <= #{endDate,jdbcType=TIMESTAMP} @@ -168,7 +168,7 @@ AND s.create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND s.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND s.create_time <= #{endDate,jdbcType=TIMESTAMP} AND s.parent_id not in ( SELECT s2.service_dict_id FROM service_dict_info s2 WHERE s2.is_valid=1 @@ -185,7 +185,7 @@ AND s2.create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND s2.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND s2.create_time <= #{endDate,jdbcType=TIMESTAMP} ) @@ -216,7 +216,7 @@ AND s.create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND s.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND s.create_time <= #{endDate,jdbcType=TIMESTAMP} AND s.parent_id not in ( SELECT s2.service_dict_id FROM service_dict_info s2 WHERE s2.is_valid=1 @@ -233,7 +233,7 @@ AND s2.create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND s2.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND s2.create_time <= #{endDate,jdbcType=TIMESTAMP} ) @@ -266,7 +266,7 @@ AND create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND create_time <= #{endDate,jdbcType=TIMESTAMP} @@ -287,7 +287,7 @@ AND create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND create_time <= #{endDate,jdbcType=TIMESTAMP} diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml index 997881f4a..0541db8e2 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml @@ -67,7 +67,7 @@ AND create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND create_time <= #{endDate,jdbcType=TIMESTAMP} @@ -107,7 +107,7 @@ AND s.create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND s.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND s.create_time <= #{endDate,jdbcType=TIMESTAMP} AND s.parent_id not in ( SELECT s2.sys_dict_id FROM sys_dict_info s2 WHERE s2.is_valid=1 @@ -124,7 +124,7 @@ AND s2.create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND s2.create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND s2.create_time <= #{endDate,jdbcType=TIMESTAMP} ) @@ -155,7 +155,7 @@ AND create_time >= #{beginDate,jdbcType=TIMESTAMP} - AND create_time <= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY) + AND create_time <= #{endDate,jdbcType=TIMESTAMP} 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 6b31fc6c2..d07e3887e 100644 --- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.google.common.collect.Lists; import com.nis.domain.Page; @@ -285,6 +286,7 @@ public class ServiceDictInfoService extends BaseService{ * 新增或修改业务字典表(添加层级改变) * @param serviceDictInfo */ + @Transactional public void saveOrUpdate(ServiceDictInfo serviceDictInfo) { if(serviceDictInfo.getParent()==null ||(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()==null) @@ -351,6 +353,7 @@ public class ServiceDictInfoService extends BaseService{ * 删除 * @param serviceDictInfo */ + @Transactional(readOnly = false) public void deleteDict(ServiceDictInfo serviceDictInfo) { List list = Lists.newArrayList(); //找出所有下级 diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp index 1d956bb3a..6547b801f 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp @@ -39,11 +39,17 @@
- +
+
+ +
+ +
+
@@ -68,6 +74,36 @@
+ <%--
+ +
+ +
+
--%> +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp index 38e3d78d2..fc251075c 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp @@ -78,9 +78,9 @@ :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
- + - + + diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index ff9c7365f..abe93f130 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -78,9 +78,9 @@ :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
配置编码配置内容描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作
配置ID配置编码配置内容描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作
${serviceDictInfo.itemCode}${serviceDictInfo.serviceDictId}${serviceDictInfo.itemCode} ${serviceDictInfo.itemValue} ${fns:abbr(serviceDictInfo.itemDesc,15)} ${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}
- + @@ -96,7 +96,6 @@ - diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp index 418db4c2c..26705a632 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp @@ -78,9 +78,9 @@ :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
层级
${serviceDictInfo.itemCode}${fns:abbr(serviceDictInfo.itemDesc,15)} ${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")} ${fns:getDictLabel("SYS_YES_NO",serviceDictInfo.isLeaf,"0")}${serviceDictInfo.levelNo} ${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name}
- + @@ -96,7 +96,6 @@ - diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 9f3e3a6c5..d71ca2995 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -64,7 +64,7 @@
- + :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> :" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> + value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
配置编码配置内容描述信息数据类型叶子节点层级创建人员创建时间最近修改人员最近修改时间操作
配置编码配置内容描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作
${sysDictInfo.itemCode}${fns:abbr(sysDictInfo.itemDesc,15)} ${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")} ${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")}${sysDictInfo.levelNo} ${fns:getUserById(sysDictInfo.sysDictCreator.id).name}
- + @@ -96,7 +96,6 @@ -
层级
${sysDictInfo.itemCode}${fns:abbr(sysDictInfo.itemDesc,15)} ${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")} ${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")}${sysDictInfo.levelNo} ${fns:getUserById(sysDictInfo.sysDictCreator.id).name}