Commit 54457b34 authored by 廖旭伟's avatar 廖旭伟

窗口负责人详情增加字段

parent d7fb9baa
......@@ -35,6 +35,18 @@ public class WindowOwnerDetailEntity extends WindowOwnerDetailVo {
* 备注
*/
private String remark;
/**
* 窗口编号
*/
private String windowCode;
/**
* 所属楼栋
*/
private Integer building;
/**
* 所属楼层
*/
private Integer level;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -56,5 +68,8 @@ public class WindowOwnerDetailEntity extends WindowOwnerDetailVo {
this.windowId = null;
this.windowName = "";
this.remark = "";
this.windowCode = "";
this.building = 1;
this.level = 1;
}
}
\ No newline at end of file
......@@ -106,6 +106,41 @@ public class WindowOwnerDetailQuery extends WindowOwnerDetailEntity {
/** 结束 修改时间 */
private String updateTimeEnd;
/** 窗口编号 */
private List<String> windowCodeList;
/** 窗口编号排除列表 */
private List <String> windowCodeNotList;
/** 开始 所属楼栋 */
private Integer buildingStart;
/** 结束 所属楼栋 */
private Integer buildingEnd;
/** 增加 所属楼栋 */
private Integer buildingIncrement;
/** 所属楼栋列表 */
private List <Integer> buildingList;
/** 所属楼栋排除列表 */
private List <Integer> buildingNotList;
/** 开始 所属楼层 */
private Integer levelStart;
/** 结束 所属楼层 */
private Integer levelEnd;
/** 增加 所属楼层 */
private Integer levelIncrement;
/** 所属楼层列表 */
private List <Integer> levelList;
/** 所属楼层排除列表 */
private List <Integer> levelNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WindowOwnerDetailQuery> orConditionList;
......@@ -647,6 +682,200 @@ public class WindowOwnerDetailQuery extends WindowOwnerDetailEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 窗口编号
* @return windowCodeList
*/
public List<String> getWindowCodeList(){
return this.windowCodeList;
}
/**
* 设置 窗口编号
* @param windowCodeList
*/
public void setWindowCodeList(List<String> windowCodeList){
this.windowCodeList = windowCodeList;
}
/**
* 获取 窗口编号
* @return windowCodeNotList
*/
public List<String> getWindowCodeNotList(){
return this.windowCodeNotList;
}
/**
* 设置 窗口编号
* @param windowCodeNotList
*/
public void setWindowCodeNotList(List<String> windowCodeNotList){
this.windowCodeNotList = windowCodeNotList;
}
/**
* 获取 开始 所属楼栋
* @return buildingStart
*/
public Integer getBuildingStart(){
return this.buildingStart;
}
/**
* 设置 开始 所属楼栋
* @param buildingStart
*/
public void setBuildingStart(Integer buildingStart){
this.buildingStart = buildingStart;
}
/**
* 获取 结束 所属楼栋
* @return $buildingEnd
*/
public Integer getBuildingEnd(){
return this.buildingEnd;
}
/**
* 设置 结束 所属楼栋
* @param buildingEnd
*/
public void setBuildingEnd(Integer buildingEnd){
this.buildingEnd = buildingEnd;
}
/**
* 获取 增加 所属楼栋
* @return buildingIncrement
*/
public Integer getBuildingIncrement(){
return this.buildingIncrement;
}
/**
* 设置 增加 所属楼栋
* @param buildingIncrement
*/
public void setBuildingIncrement(Integer buildingIncrement){
this.buildingIncrement = buildingIncrement;
}
/**
* 获取 所属楼栋
* @return buildingList
*/
public List<Integer> getBuildingList(){
return this.buildingList;
}
/**
* 设置 所属楼栋
* @param buildingList
*/
public void setBuildingList(List<Integer> buildingList){
this.buildingList = buildingList;
}
/**
* 获取 所属楼栋
* @return buildingNotList
*/
public List<Integer> getBuildingNotList(){
return this.buildingNotList;
}
/**
* 设置 所属楼栋
* @param buildingNotList
*/
public void setBuildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
}
/**
* 获取 开始 所属楼层
* @return levelStart
*/
public Integer getLevelStart(){
return this.levelStart;
}
/**
* 设置 开始 所属楼层
* @param levelStart
*/
public void setLevelStart(Integer levelStart){
this.levelStart = levelStart;
}
/**
* 获取 结束 所属楼层
* @return $levelEnd
*/
public Integer getLevelEnd(){
return this.levelEnd;
}
/**
* 设置 结束 所属楼层
* @param levelEnd
*/
public void setLevelEnd(Integer levelEnd){
this.levelEnd = levelEnd;
}
/**
* 获取 增加 所属楼层
* @return levelIncrement
*/
public Integer getLevelIncrement(){
return this.levelIncrement;
}
/**
* 设置 增加 所属楼层
* @param levelIncrement
*/
public void setLevelIncrement(Integer levelIncrement){
this.levelIncrement = levelIncrement;
}
/**
* 获取 所属楼层
* @return levelList
*/
public List<Integer> getLevelList(){
return this.levelList;
}
/**
* 设置 所属楼层
* @param levelList
*/
public void setLevelList(List<Integer> levelList){
this.levelList = levelList;
}
/**
* 获取 所属楼层
* @return levelNotList
*/
public List<Integer> getLevelNotList(){
return this.levelNotList;
}
/**
* 设置 所属楼层
* @param levelNotList
*/
public void setLevelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
}
/**
* 设置 序号,主键,自增长
* @param id
......@@ -957,6 +1186,133 @@ public class WindowOwnerDetailQuery extends WindowOwnerDetailEntity {
}
/**
* 设置 窗口编号
* @param windowCode
*/
public WindowOwnerDetailQuery windowCode(String windowCode){
setWindowCode(windowCode);
return this;
}
/**
* 设置 窗口编号
* @param windowCodeList
*/
public WindowOwnerDetailQuery windowCodeList(List<String> windowCodeList){
this.windowCodeList = windowCodeList;
return this;
}
/**
* 设置 所属楼栋
* @param building
*/
public WindowOwnerDetailQuery building(Integer building){
setBuilding(building);
return this;
}
/**
* 设置 开始 所属楼栋
* @param buildingStart
*/
public WindowOwnerDetailQuery buildingStart(Integer buildingStart){
this.buildingStart = buildingStart;
return this;
}
/**
* 设置 结束 所属楼栋
* @param buildingEnd
*/
public WindowOwnerDetailQuery buildingEnd(Integer buildingEnd){
this.buildingEnd = buildingEnd;
return this;
}
/**
* 设置 增加 所属楼栋
* @param buildingIncrement
*/
public WindowOwnerDetailQuery buildingIncrement(Integer buildingIncrement){
this.buildingIncrement = buildingIncrement;
return this;
}
/**
* 设置 所属楼栋
* @param buildingList
*/
public WindowOwnerDetailQuery buildingList(List<Integer> buildingList){
this.buildingList = buildingList;
return this;
}
/**
* 设置 所属楼栋
* @param buildingNotList
*/
public WindowOwnerDetailQuery buildingNotList(List<Integer> buildingNotList){
this.buildingNotList = buildingNotList;
return this;
}
/**
* 设置 所属楼层
* @param level
*/
public WindowOwnerDetailQuery level(Integer level){
setLevel(level);
return this;
}
/**
* 设置 开始 所属楼层
* @param levelStart
*/
public WindowOwnerDetailQuery levelStart(Integer levelStart){
this.levelStart = levelStart;
return this;
}
/**
* 设置 结束 所属楼层
* @param levelEnd
*/
public WindowOwnerDetailQuery levelEnd(Integer levelEnd){
this.levelEnd = levelEnd;
return this;
}
/**
* 设置 增加 所属楼层
* @param levelIncrement
*/
public WindowOwnerDetailQuery levelIncrement(Integer levelIncrement){
this.levelIncrement = levelIncrement;
return this;
}
/**
* 设置 所属楼层
* @param levelList
*/
public WindowOwnerDetailQuery levelList(List<Integer> levelList){
this.levelList = levelList;
return this;
}
/**
* 设置 所属楼层
* @param levelNotList
*/
public WindowOwnerDetailQuery levelNotList(List<Integer> levelNotList){
this.levelNotList = levelNotList;
return this;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
......@@ -1044,6 +1044,9 @@ CREATE TABLE mortals_xhx_window_owner_detail(
`ownerId` bigint(20) DEFAULT '0' COMMENT '负责人Id',
`windowId` bigint(20) DEFAULT '0' COMMENT '窗口id',
`windowName` varchar(64) COMMENT '窗口名称',
`windowCode` varchar(64) COMMENT '窗口编号',
`building` tinyint(2) DEFAULT '1' COMMENT '所属楼栋',
`level` tinyint(2) DEFAULT '1' COMMENT '所属楼层',
`remark` varchar(255) COMMENT '备注',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment