k94314517
2024-05-10 a4d4a7c8db6cbd2ca9e395fa2a194631db204a1a
代码初始化
已修改2个文件
24 ■■■■■ 文件已修改
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java
@@ -56,8 +56,7 @@
    @PostMapping("/create")
    @RequiresPermissions("business:bookings:create")
    public ApiResponse create(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo user = getLoginUser(token);
        bookings.setCreator(user.getId());
        bookings.setUserInfo(getLoginUser(token));
        return ApiResponse.success(bookingsService.create(bookings));
    }
@@ -65,7 +64,7 @@
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:bookings:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        bookingsService.deleteById(id);
        bookingsService.deleteById(id,getLoginUser(token));
        return ApiResponse.success(null);
    }
@@ -86,8 +85,7 @@
    @PostMapping("/updateById")
    @RequiresPermissions("business:bookings:update")
    public ApiResponse updateById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        LoginUserInfo user = getLoginUser(token);
        bookings.setCreator(user.getId());
        bookings.setUserInfo(getLoginUser(token));
        bookingsService.updateById(bookings);
        return ApiResponse.success(null);
    }
@@ -117,7 +115,8 @@
    @ApiOperation("取消")
    @PostMapping("/cancelById")
    @RequiresPermissions("business:bookings:update")
    public ApiResponse cancelById(@RequestBody Bookings bookings) {
    public ApiResponse cancelById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        bookings.setUserInfo(getLoginUser(token));
        bookingsService.cancelById(bookings);
        return ApiResponse.success(null);
    }
@@ -140,7 +139,6 @@
    @PostMapping("/exportUserStatistics")
    @RequiresPermissions("business:bookings:exportExcel")
    public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response) {
        List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
        if (!CollectionUtils.isEmpty(records)){
            JSONArray o = (JSONArray) JSON.toJSON(records);
@@ -188,7 +186,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "1 今天 2 本周", required = true),
    })
    public ApiResponse<List<Bookings>> getMyJoinBookingMeet(@RequestParam Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<List<Bookings>> getMyJoinBookingMeet(@RequestParam Integer type
            ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        LocalDateTime startTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(00,00,00));
        LocalDateTime endTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(23,59,59));
@@ -205,7 +204,8 @@
     */
    @ApiOperation("获取用户当当月预约会议情况")
    @PostMapping("/findMothBookingMeet")
    public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId
            ,String dateMonth,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(token).getId(),roomId,dateMonth));
    }
}
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -161,4 +162,9 @@
    @ApiModelProperty(value = "weekday")
    @TableField(exist = false)
    private String weekday;
    @ApiModelProperty(value = "用户信息")
    @TableField(exist = false)
    private LoginUserInfo userInfo;
}