gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

搜索条件，开始时间结束时间控件精确到日期；

Browse Source 
列表中去掉“层级”一列；
列表中显示序号一列
数据列表上下级节点的数据类型校验
分类性质菜单拆分，分为分类管理、性质管理两个菜单
地域、运营商、特征作用域三种数据拆分为三个功能菜单管理地域管理、运营商管理、特征作用域管理。
This commit is contained in:
zhangshilin
2018-03-10 18:54:05 +08:00
parent fd6425772c
commit bdea050447
20 changed files with 1521 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -116,7 +116,9 @@ public class SysDictInfoController extends BaseController {
if(StringUtils.strIsBlank(sysDictInfo.getItemValue())
&&StringUtils.strIsBlank(sysDictInfo.getItemCode())
&&sysDictInfo.getBeginDate()==null
&&sysDictInfo.getEndDate()==null){
&&sysDictInfo.getEndDate()==null
&&sysDictInfo.getEditBeginDate()==null
&&sysDictInfo.getEditEndDate()==null){
if(sysDictInfo.getItemType()!=null){
selectedType = sysDictInfo.getItemType();
return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType;
@@ -134,6 +136,18 @@ public class SysDictInfoController extends BaseController {
model.addAttribute("selectedType", selectedType);
sysDictInfo.setItemType(selectedType);
}
String searchType = null;
String searchContent = null;
if(!StringUtils.isBlank(sysDictInfo.getItemCode())){
searchType = "itemCode";
searchContent = sysDictInfo.getItemCode();
}
if(!StringUtils.isBlank(sysDictInfo.getItemValue())){
searchType = "itemValue";
searchContent = sysDictInfo.getItemValue();
}
model.addAttribute("searchType", searchType);
model.addAttribute("searchContent", searchContent);
//先查出条件查询所有数据（注意顺序）
List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
@@ -198,10 +212,18 @@ public class SysDictInfoController extends BaseController {
* @return
*/
@RequestMapping(value={"form"})
public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) {
public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType, String mulitId) {
if(doAction!=null&&doAction.equals("0")){
return "/basics/sysDictInfo";
}
Integer id=0;
if(mulitId!=null){
String[] ids = mulitId.split(",");
id = Integer.valueOf(ids[0]);
}
if(id!=0){
sysDictInfo = sysDictInfoService.getDictById(id);
}
if (sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null||sysDictInfo.getParent().getSysDictId() == 0) {
SysDictInfo parent = new SysDictInfo();
parent.setSysDictId(0);
@@ -247,9 +269,9 @@ public class SysDictInfoController extends BaseController {
* @return
*/
@RequestMapping(value={"delete"})
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType) {
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try {
sysDictInfoService.deleteDict(sysDictInfo);
sysDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes, "删除成功");
} catch (Exception e) {
e.printStackTrace();
@@ -413,7 +435,7 @@ public class SysDictInfoController extends BaseController {
*/
@ResponseBody
@RequestMapping(value = "ajaxLeafHasTree")
public boolean ajaxLeafHasTree(Integer serviceDictId,Integer newIsLeaf,Integer parentId) {
public boolean ajaxLeafHasTree(Integer sysDictId,Integer newIsLeaf,Integer parentId) {
if(parentId==null||parentId==0||parentId==-1){
if(newIsLeaf==0){