添加大厅与窗口关联

base-manager/db/add.sql

@@ -97,3 +97,8 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-查
 INSERT INTO `mortals_xhx_resource` VALUES (null, '大厅窗口-菜单管理-维护', '/window/hall/add,/window/hall/edit,/window/hall/delete,/window/hall/logicDelete,/window/hall/save,/window/hall/importData', 3, 0, NULL, NULL, NULL, 0);
 
 
+-- ----------------------------
+2023-5-04
+-- ----------------------------
+ALTER TABLE mortals_sys_window ADD COLUMN `nameDesc` varchar (256)  default "" COMMENT '名称描述' AFTER englishName;
+ALTER TABLE mortals_sys_window ADD COLUMN `englishNameDesc` varchar (256)  default "" COMMENT '英文名称描述' AFTER nameDesc;

base-manager/doc/api.md

@@ -6036,6 +6036,8 @@ data|object|数据对象|-
   createTime|Date|创建时间|-
   createUserId|Long|创建用户|-
   updateTime|Date|修改时间|-
+  nameDesc|String|名称描述
+  englishNameDesc|String|英文名称描述
 dict|object|字典对象|-
  hongqi|object|字典属性对象，详见附录|-
 
@@ -6106,6 +6108,8 @@ data|object|数据对象|-
  createTime|Date|创建时间|-
  createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-
+ nameDesc|String|名称描述
+ englishNameDesc|String|英文名称描述
 dict|object|字典对象|-
  hongqi|object|字典属性对象，详见附录|-
 
@@ -6142,6 +6146,8 @@ hongqi|Integer|红旗窗口 (1.是，0.否)|是|-
 summary|String|备注|是|-
 building|Integer|楼栋|是|-
 level|Integer|楼层|是|-
+nameDesc|String|否|名称描述
+englishNameDesc|String|否|英文名称描述
 
 **请求样例:**
 

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java

 package com.mortals.xhx.module.window.model;
-
 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.window.model.vo.WindowVo;
-
+import lombok.Data;
 /**
  * 站点部门窗口实体对象
  *
  * @author zxfei
- * @date 2023-02-21
+ * @date 2023-05-04
  */
-
+@Data
 public class WindowEntity extends WindowVo {
     private static final long serialVersionUID = 1L;
 
@@ -82,305 +80,18 @@ public class WindowEntity extends WindowVo {
      * 楼层
      */
     private Integer level;
-
-
-    public WindowEntity() {
-    }
-
-    /**
-     * 获取 站点ID
-     *
-     * @return Long
-     */
-    public Long getSiteId() {
-        return siteId;
-    }
-
-    /**
-     * 设置 站点ID
-     *
-     * @param siteId
-     */
-    public void setSiteId(Long siteId) {
-        this.siteId = siteId;
-    }
-
-    /**
-     * 获取 站点名称
-     *
-     * @return String
-     */
-    public String getSiteName() {
-        return siteName;
-    }
-
-    /**
-     * 设置 站点名称
-     *
-     * @param siteName
-     */
-    public void setSiteName(String siteName) {
-        this.siteName = siteName;
-    }
-
-    /**
-     * 获取 部门ID
-     *
-     * @return Long
-     */
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    /**
-     * 设置 部门ID
-     *
-     * @param deptId
-     */
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    /**
-     * 获取 部门名称
-     *
-     * @return String
-     */
-    public String getDeptName() {
-        return deptName;
-    }
-
-    /**
-     * 设置 部门名称
-     *
-     * @param deptName
-     */
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    /**
-     * 获取 窗口名称
-     *
-     * @return String
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置 窗口名称
-     *
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取 英语窗口名
-     *
-     * @return String
-     */
-    public String getEnglishName() {
-        return englishName;
-    }
-
-    /**
-     * 设置 英语窗口名
-     *
-     * @param englishName
-     */
-    public void setEnglishName(String englishName) {
-        this.englishName = englishName;
-    }
-
-    /**
-     * 获取 区域
-     *
-     * @return String
-     */
-    public String getRegion() {
-        return region;
-    }
-
-    /**
-     * 设置 区域
-     *
-     * @param region
-     */
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
-    /**
-     * 获取 英语区域
-     *
-     * @return String
-     */
-    public String getEnglishRegion() {
-        return englishRegion;
-    }
-
-    /**
-     * 设置 英语区域
-     *
-     * @param englishRegion
-     */
-    public void setEnglishRegion(String englishRegion) {
-        this.englishRegion = englishRegion;
-    }
-
-    /**
-     * 获取 窗口编号
-     *
-     * @return String
-     */
-    public String getFromnum() {
-        return fromnum;
-    }
-
-    /**
-     * 设置 窗口编号
-     *
-     * @param fromnum
-     */
-    public void setFromnum(String fromnum) {
-        this.fromnum = fromnum;
-    }
-
     /**
-     * 获取 红旗窗口 (1.是，0.否)
-     *
-     * @return Integer
+     * 名称描述
      */
-    public Integer getHongqi() {
-        return hongqi;
-    }
-
+    private String nameDesc;
     /**
-     * 设置 红旗窗口 (1.是，0.否)
-     *
-     * @param hongqi
-     */
-    public void setHongqi(Integer hongqi) {
-        this.hongqi = hongqi;
-    }
-
-    /**
-     * 获取 无人值守(1.是，)
-     *
-     * @return Integer
+     * 英文名称描述
      */
-    public Integer getDuty() {
-        return duty;
-    }
-
-    /**
-     * 设置 无人值守(1.是，)
-     *
-     * @param duty
-     */
-    public void setDuty(Integer duty) {
-        this.duty = duty;
-    }
-
-    /**
-     * 获取 显示内容
-     *
-     * @return String
-     */
-    public String getDutyContent() {
-        return dutyContent;
-    }
-
-    /**
-     * 设置 显示内容
-     *
-     * @param dutyContent
-     */
-    public void setDutyContent(String dutyContent) {
-        this.dutyContent = dutyContent;
-    }
-
-    /**
-     * 获取 显示英文
-     *
-     * @return String
-     */
-    public String getDutyEnglish() {
-        return dutyEnglish;
-    }
-
-    /**
-     * 设置 显示英文
-     *
-     * @param dutyEnglish
-     */
-    public void setDutyEnglish(String dutyEnglish) {
-        this.dutyEnglish = dutyEnglish;
-    }
-
-    /**
-     * 获取 备注
-     *
-     * @return String
-     */
-    public String getSummary() {
-        return summary;
-    }
-
-    /**
-     * 设置 备注
-     *
-     * @param summary
-     */
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    /**
-     * 获取 楼栋
-     *
-     * @return Integer
-     */
-    public Integer getBuilding() {
-        return building;
-    }
-
-    /**
-     * 设置 楼栋
-     *
-     * @param building
-     */
-    public void setBuilding(Integer building) {
-        this.building = building;
-    }
-
-    /**
-     * 获取 楼层
-     *
-     * @return Integer
-     */
-    public Integer getLevel() {
-        return level;
-    }
-
-    /**
-     * 设置 楼层
-     *
-     * @param level
-     */
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-
+    private String englishNameDesc;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
     }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -393,59 +104,42 @@ public class WindowEntity extends WindowVo {
         return false;
     }
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder("");
-        sb.append(",siteId:").append(getSiteId());
-        sb.append(",siteName:").append(getSiteName());
-        sb.append(",deptId:").append(getDeptId());
-        sb.append(",deptName:").append(getDeptName());
-        sb.append(",name:").append(getName());
-        sb.append(",englishName:").append(getEnglishName());
-        sb.append(",region:").append(getRegion());
-        sb.append(",englishRegion:").append(getEnglishRegion());
-        sb.append(",fromnum:").append(getFromnum());
-        sb.append(",hongqi:").append(getHongqi());
-        sb.append(",duty:").append(getDuty());
-        sb.append(",dutyContent:").append(getDutyContent());
-        sb.append(",dutyEnglish:").append(getDutyEnglish());
-        sb.append(",summary:").append(getSummary());
-        sb.append(",building:").append(getBuilding());
-        sb.append(",level:").append(getLevel());
-        return sb.toString();
-    }
-
-    public void initAttrValue() {
+    public void initAttrValue(){
 
-        this.siteId = 0L;
+        this.siteId = null;
 
-        this.siteName = "";
+        this.siteName = null;
 
         this.deptId = null;
 
-        this.deptName = "";
+        this.deptName = null;
 
-        this.name = "";
+        this.name = null;
 
-        this.englishName = "";
+        this.englishName = null;
 
-        this.region = "";
+        this.region = null;
 
-        this.englishRegion = "";
+        this.englishRegion = null;
 
-        this.fromnum = "";
+        this.fromnum = null;
 
         this.hongqi = 1;
 
-        this.duty = 0;
+        this.duty = null;
 
         this.dutyContent = "";
 
         this.dutyEnglish = "";
 
-        this.summary = "";
+        this.summary = null;
 
         this.building = 1;
 
         this.level = 1;
+
+        this.nameDesc = "";
+
+        this.englishNameDesc = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.window.model.WindowEntity;
  * 站点部门窗口查询对象
  *
  * @author zxfei
- * @date 2023-02-21
+ * @date 2023-05-04
  */
 public class WindowQuery extends WindowEntity {
     /** 开始 序号，主键，自增长 */
@@ -191,6 +191,16 @@ public class WindowQuery extends WindowEntity {
     /** 结束 修改时间 */
     private String updateTimeEnd;
 
+    /** 名称描述 */
+    private List<String> nameDescList;
+
+    /** 名称描述排除列表 */
+    private List <String> nameDescNotList;
+    /** 英文名称描述 */
+    private List<String> englishNameDescList;
+
+    /** 英文名称描述排除列表 */
+    private List <String> englishNameDescNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<WindowQuery> orConditionList;
 
@@ -1231,6 +1241,70 @@ public class WindowQuery extends WindowEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 名称描述
+     * @return nameDescList
+     */
+    public List<String> getNameDescList(){
+        return this.nameDescList;
+    }
+
+    /**
+     * 设置 名称描述
+     * @param nameDescList
+     */
+    public void setNameDescList(List<String> nameDescList){
+        this.nameDescList = nameDescList;
+    }
+
+    /**
+     * 获取 名称描述
+     * @return nameDescNotList
+     */
+    public List<String> getNameDescNotList(){
+        return this.nameDescNotList;
+    }
+
+    /**
+     * 设置 名称描述
+     * @param nameDescNotList
+     */
+    public void setNameDescNotList(List<String> nameDescNotList){
+        this.nameDescNotList = nameDescNotList;
+    }
+
+    /**
+     * 获取 英文名称描述
+     * @return englishNameDescList
+     */
+    public List<String> getEnglishNameDescList(){
+        return this.englishNameDescList;
+    }
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDescList
+     */
+    public void setEnglishNameDescList(List<String> englishNameDescList){
+        this.englishNameDescList = englishNameDescList;
+    }
+
+    /**
+     * 获取 英文名称描述
+     * @return englishNameDescNotList
+     */
+    public List<String> getEnglishNameDescNotList(){
+        return this.englishNameDescNotList;
+    }
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDescNotList
+     */
+    public void setEnglishNameDescNotList(List<String> englishNameDescNotList){
+        this.englishNameDescNotList = englishNameDescNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1855,6 +1929,44 @@ public class WindowQuery extends WindowEntity {
     }
 
 
+
+    /**
+     * 设置 名称描述
+     * @param nameDesc
+     */
+    public WindowQuery nameDesc(String nameDesc){
+        setNameDesc(nameDesc);
+        return this;
+    }
+
+    /**
+     * 设置 名称描述
+     * @param nameDescList
+     */
+    public WindowQuery nameDescList(List<String> nameDescList){
+        this.nameDescList = nameDescList;
+        return this;
+    }
+
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDesc
+     */
+    public WindowQuery englishNameDesc(String englishNameDesc){
+        setEnglishNameDesc(englishNameDesc);
+        return this;
+    }
+
+    /**
+     * 设置 英文名称描述
+     * @param englishNameDescList
+     */
+    public WindowQuery englishNameDescList(List<String> englishNameDescList){
+        this.englishNameDescList = englishNameDescList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

base-manager/src/test/java/com/mortals/httpclient/site/SiteMatterController.http

@@ -6,8 +6,9 @@ Content-Type: application/json
 {
     "siteId":1,
     "page":1,
-  "deptCode":"214125125245",
+  "deptCode":"008702197",
   "display": 1,
+  "source": 1,
     "size":10
 }