已完成:

①字典列表,配置编码移到配置内容前一列
    ②系统字典与业务字典的item_code字段int类型改为varchar(64)
    ③业务字典和系统字典表增加一个字段,level_no,层级(新增、修改已加入)
    ④完成条件分页查询(折叠逻辑与无条件查询一致,)
    ⑤优化分页查询代码(预留介入条件排序),
  
  待完善:修改、删除时下层级递归处理待添加事务性及测试(待手动抛异常重点测试)
                      生效范围测试尚未完毕,待处理
         jquery Validate验证层级关系受<sys:treeselect>影响,待处理
                      样式调整:分页样式(尚未调整),
This commit is contained in:
zhangshilin
2018-03-08 20:30:01 +08:00
parent fb383e8cf1
commit 67645d21ca
15 changed files with 717 additions and 185 deletions

View File

@@ -18,7 +18,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
private Integer sysDictId; //service_dict_id 字典ID int N 主键,自增
private Integer itemType; //item_type 数据类型 int N 1分类 2性质 3标签
private Integer itemCode; //item_code编码 int N
private String itemCode; //item_code编码 varchar N
private String itemValue; //item_value 编码对应值 varchar2(64) N
private String itemDesc; //item_desc 描述信息 varcahr2(128) Y
private SysDictInfo parent; //parent_id 父ID number(9) N 无父属性默认填0
@@ -28,6 +28,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
private Date createTime; //create_time 配置时间 date N
private SysUser sysDictEditor; //editor_id 修改人员 int Y 取自sys_user.id
private Date editTime; //edit_time 修改时间 date Y
private Integer levelNo; //层级
private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
private Date beginDate; // 开始日期
@@ -46,10 +47,10 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
public void setItemType(Integer itemType) {
this.itemType = itemType;
}
public Integer getItemCode() {
public String getItemCode() {
return itemCode;
}
public void setItemCode(Integer itemCode) {
public void setItemCode(String itemCode) {
this.itemCode = itemCode;
}
public String getItemValue() {
@@ -124,6 +125,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public Integer getLevelNo() {
return levelNo;
}
public void setLevelNo(Integer levelNo) {
this.levelNo = levelNo;
}
@JsonIgnore
public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
for (int i=0; i<sourcelist.size(); i++){