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

更新内容：

Browse Source 
①解决日期条件回传bug,
    ②列表序号下级菜单不参与主序号计算，下级序号以标识符隔开，标识符在配置中添加
    ③列表总条数按查询数据总数目计算
    ④菜单添加中英文
待处理：
    ①搜索结果页面条件查询表单重置时日期无法重置
This commit is contained in:
zhangshilin
2018-03-12 14:47:59 +08:00
parent 17668bceb7
commit f02d7aca20
13 changed files with 151 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/Page.java
View File

@@ -379,7 +379,7 @@ public class Page<T> {
sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 页，");
sb.append("共 " + count + " 条"+(message!=null?message:"")+"</a></li>\n");
sb.append("共 <span id='showTotalCount'>" + count + "</span> 条"+(message!=null?message:"")+"</a></li>\n");
sb.insert(0,"<ul>\n").append("</ul>\n");

40
src/main/java/com/nis/domain/basics/ServiceDictInfo.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nis.domain.BaseEntity;
import com.nis.domain.SysMenu;
import com.nis.domain.SysUser;
import com.nis.util.Configurations;
/**
* 业务辅助表-业务字典信息表
* @author zsl
@@ -39,6 +40,8 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
private Date editBeginDate; // 修改开始日期
private Date editEndDate; // 修改结束日期
private String showSequence; //显示序号
public Integer getServiceDictId() {
return serviceDictId;
@@ -150,6 +153,12 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
public void setEditEndDate(Date editEndDate) {
this.editEndDate = editEndDate;
}
public String getShowSequence() {
return showSequence;
}
public void setShowSequence(String showSequence) {
this.showSequence = showSequence;
}
@JsonIgnore
public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
for (int i=0; i<sourcelist.size(); i++){
@@ -198,4 +207,35 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
return listTemp.size();
}
//处理下级序号
public static void addChildrenSeq(List<ServiceDictInfo> list,Integer parentId){
int countNo = 1;
for(int i=0; i<list.size(); i++){
ServiceDictInfo serviceDictInfo = list.get(i);
if(serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null
&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
//找出该父类
for(ServiceDictInfo se:list){
if(se.getServiceDictId()==parentId){
serviceDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
countNo++;
}
}
//继续获取子节点
for (int j=0; j<list.size(); j++){
ServiceDictInfo child = list.get(j);
if (child.getParent()!=null && child.getParent().getServiceDictId()!=null
&& child.getParent().getServiceDictId().equals(serviceDictInfo.getServiceDictId())){
addChildrenSeq(list, serviceDictInfo.getServiceDictId());
break;
}
}
}
}
}
}

39
src/main/java/com/nis/domain/basics/SysDictInfo.java
View File

@@ -7,6 +7,7 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nis.domain.BaseEntity;
import com.nis.domain.SysUser;
import com.nis.util.Configurations;
/**
* 业务辅助表-系统字典信息表
* @author zsl
@@ -37,6 +38,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
private Date editBeginDate; // 修改开始日期
private Date editEndDate; // 修改结束日期
private String showSequence; //显示序号
public Integer getSysDictId() {
@@ -147,7 +149,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
public void setEditEndDate(Date editEndDate) {
this.editEndDate = editEndDate;
}
public void setShowSequence(String showSequence) {
this.showSequence = showSequence;
}
public String getShowSequence() {
return showSequence;
}
@JsonIgnore
public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
for (int i=0; i<sourcelist.size(); i++){
@@ -169,5 +176,33 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
}
}
}
//处理下级序号
public static void addChildrenSeq(List<SysDictInfo> list,Integer parentId){
int countNo = 1;
for(int i=0; i<list.size(); i++){
SysDictInfo sysDictInfo = list.get(i);
if(sysDictInfo.getParent()!=null && sysDictInfo.getParent().getSysDictId()!=null
&& sysDictInfo.getParent().getSysDictId().equals(parentId)){
//找出该父类
for(SysDictInfo se:list){
if(se.getSysDictId()==parentId){
sysDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
countNo++;
}
}
//继续获取子节点
for (int j=0; j<list.size(); j++){
SysDictInfo child = list.get(j);
if (child.getParent()!=null && child.getParent().getSysDictId()!=null
&& child.getParent().getSysDictId().equals(sysDictInfo.getSysDictId())){
addChildrenSeq(list, sysDictInfo.getSysDictId());
break;
}
}
}
}
}
}

19
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -60,6 +60,7 @@ public class ServiceDictInfoController extends BaseController {
/**
* 查询业务辅助表-业务字典信息列表(无条件分页查询)
* （修改内容：添加查询数据总数，添加原则：不得修改原对象引用参数，不得影响原分页参数page数据）
* @param serviceDictInfo
* @param request
* @param response
@@ -82,9 +83,16 @@ public class ServiceDictInfoController extends BaseController {
model.addAttribute("selectedType", selectedType);
serviceDictInfo.setItemType(selectedType);
}
//查询符合条件总数
List<ServiceDictInfo> showTotalCount = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
model.addAttribute("showTotalCount", showTotalCount.size());
//查出顶层分页数据
Page<ServiceDictInfo> page = serviceDictInfoService.findTopDictList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
//植入序号
for(int i=0;i<page.getList().size();i++){
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
}
model.addAttribute("page", page);
//查出所有数据
List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictList();
@@ -99,7 +107,8 @@ public class ServiceDictInfoController extends BaseController {
allList.addAll(page.getList());
ServiceDictInfo.sortList(list,allList,0,true);
//处理下级序号
ServiceDictInfo.addChildrenSeq(list, 0);
model.addAttribute("itType", itType);
model.addAttribute("intArr", Arrays.asList(intArr));
model.addAttribute("list", list);
@@ -156,9 +165,13 @@ public class ServiceDictInfoController extends BaseController {
//先查出条件查询所有数据（注意顺序）
List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
model.addAttribute("showTotalCount", allList.size());
//查出条件查询顶层分页数据
Page<ServiceDictInfo> page = serviceDictInfoService.findDictTopSearchList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
//植入序号
for(int i=0;i<page.getList().size();i++){
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
}
model.addAttribute("page", page);
//处理数据，保留顶层中的所有下层数据
@@ -182,6 +195,8 @@ public class ServiceDictInfoController extends BaseController {
allList.addAll(page.getList());
ServiceDictInfo.sortList(list,allList,0,true);
//处理下级序号
ServiceDictInfo.addChildrenSeq(list, 0);
//serviceDictInfo.setItemType(selectedType);
model.addAttribute("itType", itType);
model.addAttribute("intArr", Arrays.asList(intArr));

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

@@ -19,6 +19,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.nis.domain.Page;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.util.Configurations;
import com.nis.util.StringUtil;
@@ -81,9 +82,16 @@ public class SysDictInfoController extends BaseController {
model.addAttribute("selectedType", selectedType);
sysDictInfo.setItemType(selectedType);
}
//查询符合条件总数
List<SysDictInfo> showTotalCount = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
model.addAttribute("showTotalCount", showTotalCount.size());
//查出顶层分页数据
Page<SysDictInfo> page = sysDictInfoService.findTopDictList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
//植入序号
for(int i=0;i<page.getList().size();i++){
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
}
model.addAttribute("page", page);
//查出所有数据
List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
@@ -98,6 +106,8 @@ public class SysDictInfoController extends BaseController {
allList.addAll(page.getList());
SysDictInfo.sortList(list,allList,0,true);
//处理下级序号
SysDictInfo.addChildrenSeq(list, 0);
model.addAttribute("itType", itType);
model.addAttribute("intArr", Arrays.asList(intArr));
model.addAttribute("list", list);
@@ -152,9 +162,13 @@ public class SysDictInfoController extends BaseController {
model.addAttribute("searchContent", searchContent);
//先查出条件查询所有数据（注意顺序）
List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
model.addAttribute("showTotalCount", allList.size());
//查出条件查询顶层分页数据
Page<SysDictInfo> page = sysDictInfoService.findDictTopSearchList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
//植入序号
for(int i=0;i<page.getList().size();i++){
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
}
model.addAttribute("page", page);
//处理数据，保留顶层中的所有下层数据
@@ -186,6 +200,9 @@ public class SysDictInfoController extends BaseController {
allList.addAll(page.getList());
SysDictInfo.sortList(list,allList,0,true);
//处理下级序号
SysDictInfo.addChildrenSeq(list, 0);
/*for(int i=list.size()-1;i>=0;i--){
SysDictInfo se = list.get(i);
System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());

1
src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
View File

@@ -471,5 +471,6 @@ public class ServiceDictInfoService extends BaseService{
}