会议管理表接口调整

sinake

2 天以前 48d5a302e116d129315b6b1baff53af89a30128b

会议管理表接口调整

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ApiController.java

@@ -19,7 +19,7 @@
import java.util.Map;

@Slf4j
@Api(description = "api服务",tags={"api服务"})
@Api(description = "api服务")
@RestController
@RequestMapping("/api")
public class ApiController {

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@
      # 主库数据源
      master:
        # 开发环境
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023

@@ -60,7 +60,7 @@
            multi-statement-allow: true
  redis:
    # 地址、密码、端口（默认为6379）：开发环境
    host: 127.0.0.1
    host: 192.168.100.10
    password: Smartor
    port: 6020


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java

@@ -142,27 +142,7 @@
    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date approvalTime;

    /** 创建人 */
    @ApiModelProperty("创建人")
    @Excel(name = "创建人")
    private String createdBy;

    /** 创建时间 */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date createdTime;

    /** 更新人 */
    @ApiModelProperty("更新人")
    @Excel(name = "更新人")
    private String updatedBy;

    /** 更新时间 */
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date updatedTime;

}


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java

@@ -99,18 +99,7 @@
        if (serviceMeeting.getApprovalTime() != null){
            wrappers.eq(ServiceMeeting::getApprovalTime ,serviceMeeting.getApprovalTime());
        }
        if (StringUtils.isNotBlank(serviceMeeting.getCreatedBy())){
            wrappers.eq(ServiceMeeting::getCreatedBy ,serviceMeeting.getCreatedBy());
        }
        if (serviceMeeting.getCreatedTime() != null){
            wrappers.eq(ServiceMeeting::getCreatedTime ,serviceMeeting.getCreatedTime());
        }
        if (StringUtils.isNotBlank(serviceMeeting.getUpdatedBy())){
            wrappers.eq(ServiceMeeting::getUpdatedBy ,serviceMeeting.getUpdatedBy());
        }
        if (serviceMeeting.getUpdatedTime() != null){
            wrappers.eq(ServiceMeeting::getUpdatedTime ,serviceMeeting.getUpdatedTime());
        }

        return this.list(wrappers);
    }