Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingInfoController.java

@@ -10,12 +10,9 @@ import com.usky.meeting.service.dto.DmMeetingDto;
 import com.usky.meeting.service.vo.MeetingInfoRequestVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -51,5 +48,15 @@ public class MeetingInfoController {
         return ApiResult.success(meetingInfoService.meetingInfoList(requestVO));
     }
 
+    /**
+     * 取消会议预约申请
+     * @param meetingId
+     * @return
+     */
+    @PostMapping("cancel")
+    public ApiResult<Void> cancel(@RequestParam Long meetingId){
+        meetingInfoService.cancel(meetingId);
+        return ApiResult.success();
+    }
 }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingInfo.java

@@ -46,7 +46,7 @@ public class MeetingInfo implements Serializable {
     /**
      * 会议室房间
      */
-    @ManyToOne
+    @Transient
     @TableField(exist = false)
     private MeetingRoom roomInfo;
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingInfoService.java

@@ -9,6 +9,7 @@ import com.usky.meeting.service.vo.MeetingInfoRequestVO;
 import org.springframework.data.repository.query.Param;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.text.ParseException;
 import java.util.List;
@@ -50,4 +51,6 @@ public interface MeetingInfoService extends CrudService<MeetingInfo> {
     DmMeetingDto add(DmMeetingDto resources);
 
     CommonPage<MeetingInfo> meetingInfoList(MeetingInfoRequestVO requestVO);
+
+    void cancel(Long meetingId);
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -379,6 +379,13 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
         return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getSize(),requestVO.getCurrent());
     }
 
+    @Override
+    public void cancel(Long meetingId){
+        MeetingInfo one = this.getById(meetingId);
+        one.setIsCancel(1);
+        this.updateById(one);
+    }
+
     public void send(DmMeetingDto resources) throws ClientException {
         if (StringUtils.isNotBlank(resources.getSendType())) {
             if (resources.getSendType().equals("短信")) {