添加窗口无人值守

base-manager/db/add.sql

+
+-- ----------------------------
+2023-2-21
+-- ----------------------------
+ALTER TABLE mortals_sys_window ADD COLUMN `duty` tinyint (1)    COMMENT '无人值守(1.是，0.否)' AFTER hongqi;
+ALTER TABLE mortals_sys_window ADD COLUMN `dutyContent` varchar (256)    COMMENT '显示内容' AFTER duty;
+ALTER TABLE mortals_sys_window ADD COLUMN `dutyEnglish` varchar (256)    COMMENT '显示英文' AFTER dutyContent;
+

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

@@ -12,7 +12,7 @@ import com.mortals.xhx.module.window.model.vo.WindowVo;
  * 站点部门窗口实体对象
  *
  * @author zxfei
- * @date 2022-01-12
+ * @date 2023-02-21
  */
 
 public class WindowEntity extends WindowVo {
@@ -58,6 +58,18 @@ public class WindowEntity extends WindowVo {
      * 红旗窗口 (1.是，0.否)
      */
     private Integer hongqi;
+    /**
+     * 无人值守(1.是，)
+     */
+    private Integer duty;
+    /**
+     * 显示内容
+     */
+    private String dutyContent;
+    /**
+     * 显示英文
+     */
+    private String dutyEnglish;
     /**
      * 备注
      */
@@ -255,6 +267,60 @@ public class WindowEntity extends WindowVo {
         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;
+    }
+
     /**
      * 获取 备注
      *
@@ -339,6 +405,9 @@ public class WindowEntity extends WindowVo {
         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());
@@ -351,7 +420,7 @@ public class WindowEntity extends WindowVo {
 
         this.siteName = "";
 
-        this.deptId = 0L;
+        this.deptId = null;
 
         this.deptName = "";
 
@@ -367,6 +436,12 @@ public class WindowEntity extends WindowVo {
 
         this.hongqi = 1;
 
+        this.duty = 0;
+
+        this.dutyContent = "";
+
+        this.dutyEnglish = "";
+
         this.summary = "";
 
         this.building = 1;

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -4,9 +4,11 @@ POST {{baseUrl}}/window/list
 Content-Type: application/json
 
 {
-   "siteId":8,
+   "siteId":1,
     "page":1,
-    "size":10
+    "size":10,
+  "name": "",
+  "fromnum": "1E%"
 }