chore:测试提交

jinpengyong

2023-08-17 433b18fddbdb38f0c2a0a2358bc74fe46e10c9ba

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java

@@ -1,11 +1,13 @@
package com.moral.api.pojo.form.organization;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.entity.Organization;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import com.moral.util.RegexUtils;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;

import java.util.Date;
@@ -50,7 +52,9 @@

    private String wechat;

    private String expireTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date expireTime;

    public boolean valid() {
        if (ObjectUtils.isEmpty(organizationId))
@@ -63,9 +67,9 @@
                        ObjectUtils.isEmpty(areaCode) &&
                        ObjectUtils.isEmpty(locationLevelCode) &&
                        ObjectUtils.isEmpty(address) &&
                        ObjectUtils.isEmpty(phone) &&
                        ObjectUtils.isEmpty(email) &&
                        ObjectUtils.isEmpty(wechat) &&
                        phone==null &&
                        email==null &&
                        wechat==null &&
                        ObjectUtils.isEmpty(expireTime)
                )
            return false;
@@ -89,10 +93,8 @@
        organization.setPhone(phone);
        organization.setEmail(email);
        organization.setWechat(wechat);
        if (!ObjectUtils.isEmpty(expireTime)) {
            Date expireTimeDate = DateUtils.getDate(expireTime + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
            organization.setExpireTime(expireTimeDate);
        }
        organization.setExpireTime(expireTime);

        return organization;
    }

@@ -115,17 +117,10 @@
                return dto;
            }
        }
        //判断过期时间格式
        //判断过期时间是否小于当前时间
        if (!ObjectUtils.isEmpty(expireTime)) {
            if (!RegexUtils.checkDate(expireTime)) {
                dto.setCode(ResponseCodeEnum.TIME_FORMAT_INVALID.getCode());
                dto.setMsg(ResponseCodeEnum.TIME_FORMAT_INVALID.getMsg());
                return dto;
            }
            //判断过期时间是否小于当前时间
            Date expireDate = DateUtils.getDate(expireTime, "yyyy-MM-dd");
            Date currentDate = new Date();
            if (DateUtils.compareDateStr(expireDate, currentDate) >= 0) {
            if (DateUtils.compareDateStr(expireTime, currentDate) >= 0) {
                dto.setCode(ResponseCodeEnum.TIME_INVALID.getCode());
                dto.setMsg(ResponseCodeEnum.TIME_INVALID.getMsg());
                return dto;