From d00170e1a77c2f1cf979409946fdba4e0c8f0c09 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 29 Nov 2021 15:37:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/CancelAppointmentFormDTO.java   |  2 ++
 .../controller/IcPartyServiceCenterController.java     |  3 ++-
 .../com/epmet/dao/IcMatterAppointmentRecordDao.java    |  9 +++++++++
 .../service/impl/IcPartyServiceCenterServiceImpl.java  |  2 +-
 .../resources/mapper/IcMatterAppointmentRecordDao.xml  | 10 ++++++++++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java
index 896d3b1cb3..51faf2aa6d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CancelAppointmentFormDTO.java
@@ -19,4 +19,6 @@ public class CancelAppointmentFormDTO implements Serializable {
 
     @NotBlank(message = "recordId不能为空",groups = CancelAppointmentForm.class)
     private String recordId;
+
+    private String userId;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
index 02c1175d07..a948681219 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java
@@ -197,8 +197,9 @@ public class IcPartyServiceCenterController {
      * @date 2021/11/26 5:21 下午
      */
     @PostMapping("cancelappointment")
-    public Result cancelAppointment(@RequestBody CancelAppointmentFormDTO formDTO){
+    public Result cancelAppointment(@RequestBody CancelAppointmentFormDTO formDTO,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(formDTO,CancelAppointmentFormDTO.CancelAppointmentForm.class);
+        formDTO.setUserId(tokenDto.getUserId());
         icPartyServiceCenterService.cancelAppointment(formDTO);
         return new Result();
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
index f349032024..0b118216bb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcMatterAppointmentRecordDao.java
@@ -52,4 +52,13 @@ public interface IcMatterAppointmentRecordDao extends BaseDao<IcMatterAppointmen
      */
     List<AppointmentExistRecordResultDTO> appointmentExistRecord(@Param("matterIds")List<String> matterIds);
 
+    /**
+     * @Description  取消预约
+     * @param recordId
+     * @param userId
+     * @author zxc
+     * @date 2021/11/29 3:34 下午
+     */
+    void cancelAppointment(@Param("recordId")String recordId,@Param("userId")String userId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
index 21171e8212..3a027a9b8a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
@@ -408,7 +408,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
      */
     @Override
     public void cancelAppointment(CancelAppointmentFormDTO formDTO) {
-        matterAppointmentRecordDao.deleteById(formDTO.getRecordId());
+        matterAppointmentRecordDao.cancelAppointment(formDTO.getRecordId(), formDTO.getUserId());
     }
 
     public List<TimeDTO> getTimeList(String start,String end,Integer interval){
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
index 79c21f6c04..3b5f960894 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml
@@ -3,6 +3,16 @@
 
 <mapper namespace="com.epmet.dao.IcMatterAppointmentRecordDao">
 
+    <!-- 取消预约 -->
+    <update id="cancelAppointment">
+        UPDATE ic_matter_appointment_record
+        SET `STATUS` = 'cancel',
+            DEL_FLAG = 1,
+            UPDATED_BY = #{userId},
+            UPDATED_TIME = NOW()
+        WHERE ID = #{recordId}
+    </update>
+
     <!-- 查询预约列表 -->
     <select id="appointmentRecord" resultType="com.epmet.dto.result.AppointmentRecordResultDTO">
         SELECT