From a6fe59afda2825d57b6ac5404a7f318f44492053 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Mon, 22 Apr 2024 17:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AA=97=E5=8F=A3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java  | 7 +++++--
 .../java/com/ningdatech/kqapi/admin/model/vo/MatterDetailDTO.java  | 3 ---
 .../java/com/ningdatech/kqapi/admin/model/vo/MatterListVO.java     | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java
index 973c0f7..8bae300 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java
@@ -45,6 +45,7 @@ public class AdminMatterManage {
         }
         List<MatterListVO> data = CollUtils.convert(page.getRecords(),
                 w -> MatterListVO.builder()
+                        .id(w.getId())
                         .matterName(w.getItemName())
                         .matterType(w.getType())
                         .department(w.getDepartment())
@@ -79,10 +80,11 @@ public class AdminMatterManage {
                 .sceneDesc(matter.getSceneDesc())
                 .serviceContent(matter.getServiceContent())
                 .serviceObject(matter.getServiceObject())
+                .exerciseLevel(matter.getExerciseLevel())
                 .serviceProcess(matter.getServiceProcess())
                 .sort(matter.getSort())
                 .telephone(matter.getTelephone())
-                .window(matter.getWindow())
+                .windowName(matter.getWindow())
                 .windowId(matter.getWindowId())
                 .zoneId(matter.getZoneId())
                 .zoneName(matter.getZoneName())
@@ -103,6 +105,7 @@ public class AdminMatterManage {
         matter.setHandleChannel(req.getHandleChannel());
         matter.setHandleTime(req.getHandleTime());
         matter.setImplSubjectNature(req.getImplSubjectNature());
+        matter.setExerciseLevel(req.getExerciseLevel());
         matter.setPublicityMaterials(req.getPublicityMaterials());
         matter.setSceneDesc(req.getSceneDesc());
         matter.setServiceContent(req.getServiceContent());
@@ -110,7 +113,7 @@ public class AdminMatterManage {
         matter.setServiceProcess(req.getServiceProcess());
         matter.setSort(req.getSort());
         matter.setTelephone(req.getTelephone());
-        matter.setWindow(req.getWindow());
+        matter.setWindow(req.getWindowName());
         matter.setWindowId(req.getWindowId());
         matter.setZoneId(req.getZoneId());
         matter.setZoneName(req.getZoneName());
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterDetailDTO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterDetailDTO.java
index 52f702b..0e1ddd3 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterDetailDTO.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterDetailDTO.java
@@ -51,9 +51,6 @@ public class MatterDetailDTO {
     @ApiModelProperty("事项链接")
     private String webApplyUrl;
 
-    @ApiModelProperty("窗口")
-    private String window;
-
     @ApiModelProperty("排序")
     private Integer sort;
 
diff --git a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterListVO.java b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterListVO.java
index 3289663..79ac945 100644
--- a/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterListVO.java
+++ b/kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/MatterListVO.java
@@ -16,6 +16,9 @@ import lombok.Data;
 @Builder
 public class MatterListVO {
 
+    @ApiModelProperty("事项id")
+    private Long id;
+
     @ApiModelProperty("事项名称")
     private String matterName;