Browse Source

修改会议配置表

tags/24080901
WendyYang 10 months ago
parent
commit
0d2f8d8ca4
3 changed files with 8 additions and 4 deletions
  1. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java
  2. +1
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java
  3. +4
    -4
      hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java

+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/dto/InviteCallIgnoreTimeContentDTO.java View File

@@ -1,5 +1,6 @@
package com.hz.pm.api.meeting.entity.dto; package com.hz.pm.api.meeting.entity.dto;


import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;


import java.time.LocalTime; import java.time.LocalTime;
@@ -15,8 +16,10 @@ import java.time.LocalTime;
@Data @Data
public class InviteCallIgnoreTimeContentDTO { public class InviteCallIgnoreTimeContentDTO {


@JSONField(format = "HH:mm")
private LocalTime startTime; private LocalTime startTime;


@JSONField(format = "HH:mm")
private LocalTime stopTime; private LocalTime stopTime;


} }

+ 1
- 0
hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/req/MeetingSettingsSaveReq.java View File

@@ -29,6 +29,7 @@ public class MeetingSettingsSaveReq {
@ApiModelProperty("仅做参数展示") @ApiModelProperty("仅做参数展示")
private SettingsContentPackageDTO settingsContentPackage; private SettingsContentPackageDTO settingsContentPackage;


@Data
public static class SettingsContentPackageDTO { public static class SettingsContentPackageDTO {


@ApiModelProperty("专家邀请免打扰时段设置") @ApiModelProperty("专家邀请免打扰时段设置")


+ 4
- 4
hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingSettingsManage.java View File

@@ -42,7 +42,7 @@ public class MeetingSettingsManage {
MeetingSettingsSaveReq result = new MeetingSettingsSaveReq(); MeetingSettingsSaveReq result = new MeetingSettingsSaveReq();
result.setEnable(settings.getEnable()); result.setEnable(settings.getEnable());
result.setSettingsType(settings.getSettingsType()); result.setSettingsType(settings.getSettingsType());
result.setSettingsContent(settings.getSettingsContent());
result.setSettingsContent(JSONUtil.parseObj(settings.getSettingsContent()));
return result; return result;
} }


@@ -50,10 +50,10 @@ public class MeetingSettingsManage {
MeetingSettings settings = getBySettingsType(req.getSettingsType()); MeetingSettings settings = getBySettingsType(req.getSettingsType());
if (settings == null) { if (settings == null) {
settings = new MeetingSettings(); settings = new MeetingSettings();
settings.setSettingsContent(req.getSettingsType().name());
settings.setEnable(req.getEnable());
settings.setSettingsContent(JSONUtil.toJsonStr(req.getSettingsContent()));
} }
settings.setSettingsType(req.getSettingsType());
settings.setEnable(req.getEnable());
settings.setSettingsContent(JSONUtil.toJsonStr(req.getSettingsContent()));
meetingSettingsService.saveOrUpdate(settings); meetingSettingsService.saveOrUpdate(settings);
} }




Loading…
Cancel
Save