Skip to content

S
smart_gov_platform
Commit 72fe358f authored by 赵啸非's avatar 赵啸非
Browse files
Options

站点事项添加热门和显示

parent fbbf4eaf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 512 additions and 49 deletions
base-manager/db/add.sql
View file @ 72fe358f
......@@ -26,3 +26,10 @@ ALTER TABLE mortals_sys_app_info_field ADD COLUMN `defaultValue` varchar (255)
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `fieldTypeValue` varchar (255) default "" COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN `defaultValue` varchar (255) default "" COMMENT '字段默认值' AFTER fieldValue;
-- ----------------------------
2023-4-12
-- ----------------------------
ALTER TABLE mortals_sys_site_matter ADD COLUMN `hot` tinyint(2) DEFAULT '0' COMMENT '热门(0.否,1.是)', AFTER eventTypeShow;
ALTER TABLE mortals_sys_site_matter ADD COLUMN `display` tinyint(2) DEFAULT '0' COMMENT '显示(0.否,1.是)', AFTER hot;
base-manager/doc/api.md
View file @ 72fe358f
......@@ -1960,15 +1960,16 @@ msg|String|消息|-
**请求参数:**
参数名称|类型|备注|必填|其它
---|---|---|---|---
page|Integer|当前页|否|-
size|Integer|每页条数|否|-
siteId|Long|站点ID|否|-
siteName|String|站点名称|否|-
matterId|Long|事项ID|否|-
matterName|String|事项名称|否|-
参数名称|类型| 备注 |必填|其它
---|---|------|---|---
page|Integer| 当前页 |否|-
size|Integer| 每页条数 |否|-
siteId|Long| 站点ID |否|-
siteName|String| 站点名称 |否|-
matterId|Long| 事项ID |否|-
matterName|String| 事项名称 |否|-
hot|Integer| 热门 |否|-
display|Integer| 显示 |否|-
**请求样例:**
```
......@@ -1978,6 +1979,8 @@ matterName|String|事项名称|否|-
"siteName":"o68yk6",
"matterId":2909,
"matterName":"oz1oig",
"hot":0,
"display":1,
"page":1,
"size":10
}
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java
View file @ 72fe358f
package com.mortals.xhx.module.site.model;
import com.mortals.xhx.common.code.SourceEnum;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteMatterVo;
/**
* 站点事项实体对象
*
* @author zxfei
* @date 2022-11-16
* @date 2023-04-12
*/
public class SiteMatterEntity extends SiteMatterVo {
......@@ -52,6 +56,14 @@ public class SiteMatterEntity extends SiteMatterVo {
* 部门编号
*/
private String deptCode;
/**
* 热门(0.否,1.是)
*/
private Integer hot;
/**
* 显示(0.否,1.是)
*/
private Integer display;
......@@ -173,7 +185,6 @@ public class SiteMatterEntity extends SiteMatterVo {
* @return Integer
*/
public Integer getSource(){
return source;
}
/**
......@@ -197,6 +208,34 @@ public class SiteMatterEntity extends SiteMatterVo {
public void setDeptCode(String deptCode){
this.deptCode = deptCode;
}
/**
* 获取 热门(0.否,1.是)
* @return Integer
*/
public Integer getHot(){
return hot;
}
/**
* 设置 热门(0.否,1.是)
* @param hot
*/
public void setHot(Integer hot){
this.hot = hot;
}
/**
* 获取 显示(0.否,1.是)
* @return Integer
*/
public Integer getDisplay(){
return display;
}
/**
* 设置 显示(0.否,1.是)
* @param display
*/
public void setDisplay(Integer display){
this.display = display;
}
......@@ -229,6 +268,8 @@ public class SiteMatterEntity extends SiteMatterVo {
sb.append(",eventTypeShow:").append(getEventTypeShow());
sb.append(",source:").append(getSource());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",hot:").append(getHot());
sb.append(",display:").append(getDisplay());
return sb.toString();
}
......@@ -236,22 +277,26 @@ public class SiteMatterEntity extends SiteMatterVo {
this.siteId = null;
this.siteName = "";
this.siteName = null;
this.matterId = null;
this.matterName = "";
this.matterName = null;
this.matterCode = "";
this.matterCode = null;
this.deptId = null;
this.deptName = "";
this.deptName = null;
this.eventTypeShow = null;
this.source = null;
this.eventTypeShow = "";
this.deptCode = null;
this.source = 0;
this.hot = 0;
this.deptCode = "";
this.display = 0;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java
View file @ 72fe358f
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.site.model.SiteMatterEntity;
* 站点事项查询对象
*
* @author zxfei
* @date 2023-02-21
* @date 2023-04-12
*/
public class SiteMatterQuery extends SiteMatterEntity {
/** 开始 序号，主键，自增长 */
......@@ -141,6 +141,36 @@ public class SiteMatterQuery extends SiteMatterEntity {
/** 结束 修改时间 */
private String updateTimeEnd;
/** 开始 热门(0.否,1.是) */
private Integer hotStart;
/** 结束 热门(0.否,1.是) */
private Integer hotEnd;
/** 增加 热门(0.否,1.是) */
private Integer hotIncrement;
/** 热门(0.否,1.是)列表 */
private List <Integer> hotList;
/** 热门(0.否,1.是)排除列表 */
private List <Integer> hotNotList;
/** 开始 显示(0.否,1.是) */
private Integer displayStart;
/** 结束 显示(0.否,1.是) */
private Integer displayEnd;
/** 增加 显示(0.否,1.是) */
private Integer displayIncrement;
/** 显示(0.否,1.是)列表 */
private List <Integer> displayList;
/** 显示(0.否,1.是)排除列表 */
private List <Integer> displayNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteMatterQuery> orConditionList;
......@@ -891,6 +921,168 @@ public class SiteMatterQuery extends SiteMatterEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 热门(0.否,1.是)
* @return hotStart
*/
public Integer getHotStart(){
return this.hotStart;
}
/**
* 设置 开始 热门(0.否,1.是)
* @param hotStart
*/
public void setHotStart(Integer hotStart){
this.hotStart = hotStart;
}
/**
* 获取 结束 热门(0.否,1.是)
* @return $hotEnd
*/
public Integer getHotEnd(){
return this.hotEnd;
}
/**
* 设置 结束 热门(0.否,1.是)
* @param hotEnd
*/
public void setHotEnd(Integer hotEnd){
this.hotEnd = hotEnd;
}
/**
* 获取 增加 热门(0.否,1.是)
* @return hotIncrement
*/
public Integer getHotIncrement(){
return this.hotIncrement;
}
/**
* 设置 增加 热门(0.否,1.是)
* @param hotIncrement
*/
public void setHotIncrement(Integer hotIncrement){
this.hotIncrement = hotIncrement;
}
/**
* 获取 热门(0.否,1.是)
* @return hotList
*/
public List<Integer> getHotList(){
return this.hotList;
}
/**
* 设置 热门(0.否,1.是)
* @param hotList
*/
public void setHotList(List<Integer> hotList){
this.hotList = hotList;
}
/**
* 获取 热门(0.否,1.是)
* @return hotNotList
*/
public List<Integer> getHotNotList(){
return this.hotNotList;
}
/**
* 设置 热门(0.否,1.是)
* @param hotNotList
*/
public void setHotNotList(List<Integer> hotNotList){
this.hotNotList = hotNotList;
}
/**
* 获取 开始 显示(0.否,1.是)
* @return displayStart
*/
public Integer getDisplayStart(){
return this.displayStart;
}
/**
* 设置 开始 显示(0.否,1.是)
* @param displayStart
*/
public void setDisplayStart(Integer displayStart){
this.displayStart = displayStart;
}
/**
* 获取 结束 显示(0.否,1.是)
* @return $displayEnd
*/
public Integer getDisplayEnd(){
return this.displayEnd;
}
/**
* 设置 结束 显示(0.否,1.是)
* @param displayEnd
*/
public void setDisplayEnd(Integer displayEnd){
this.displayEnd = displayEnd;
}
/**
* 获取 增加 显示(0.否,1.是)
* @return displayIncrement
*/
public Integer getDisplayIncrement(){
return this.displayIncrement;
}
/**
* 设置 增加 显示(0.否,1.是)
* @param displayIncrement
*/
public void setDisplayIncrement(Integer displayIncrement){
this.displayIncrement = displayIncrement;
}
/**
* 获取 显示(0.否,1.是)
* @return displayList
*/
public List<Integer> getDisplayList(){
return this.displayList;
}
/**
* 设置 显示(0.否,1.是)
* @param displayList
*/
public void setDisplayList(List<Integer> displayList){
this.displayList = displayList;
}
/**
* 获取 显示(0.否,1.是)
* @return displayNotList
*/
public List<Integer> getDisplayNotList(){
return this.displayNotList;
}
/**
* 设置 显示(0.否,1.是)
* @param displayNotList
*/
public void setDisplayNotList(List<Integer> displayNotList){
this.displayNotList = displayNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
......@@ -1331,6 +1523,114 @@ public class SiteMatterQuery extends SiteMatterEntity {
}
/**
* 设置 热门(0.否,1.是)
* @param hot
*/
public SiteMatterQuery hot(Integer hot){
setHot(hot);
return this;
}
/**
* 设置 开始 热门(0.否,1.是)
* @param hotStart
*/
public SiteMatterQuery hotStart(Integer hotStart){
this.hotStart = hotStart;
return this;
}
/**
* 设置 结束 热门(0.否,1.是)
* @param hotEnd
*/
public SiteMatterQuery hotEnd(Integer hotEnd){
this.hotEnd = hotEnd;
return this;
}
/**
* 设置 增加 热门(0.否,1.是)
* @param hotIncrement
*/
public SiteMatterQuery hotIncrement(Integer hotIncrement){
this.hotIncrement = hotIncrement;
return this;
}
/**
* 设置 热门(0.否,1.是)
* @param hotList
*/
public SiteMatterQuery hotList(List<Integer> hotList){
this.hotList = hotList;
return this;
}
/**
* 设置 热门(0.否,1.是)
* @param hotNotList
*/
public SiteMatterQuery hotNotList(List<Integer> hotNotList){
this.hotNotList = hotNotList;
return this;
}
/**
* 设置 显示(0.否,1.是)
* @param display
*/
public SiteMatterQuery display(Integer display){
setDisplay(display);
return this;
}
/**
* 设置 开始 显示(0.否,1.是)
* @param displayStart
*/
public SiteMatterQuery displayStart(Integer displayStart){
this.displayStart = displayStart;
return this;
}
/**
* 设置 结束 显示(0.否,1.是)
* @param displayEnd
*/
public SiteMatterQuery displayEnd(Integer displayEnd){
this.displayEnd = displayEnd;
return this;
}
/**
* 设置 增加 显示(0.否,1.是)
* @param displayIncrement
*/
public SiteMatterQuery displayIncrement(Integer displayIncrement){
this.displayIncrement = displayIncrement;
return this;
}
/**
* 设置 显示(0.否,1.是)
* @param displayList
*/
public SiteMatterQuery displayList(List<Integer> displayList){
this.displayList = displayList;
return this;
}
/**
* 设置 显示(0.否,1.是)
* @param displayNotList
*/
public SiteMatterQuery displayNotList(List<Integer> displayNotList){
this.displayNotList = displayNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
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