From e913f07719d7a1dc6f2d695681120ba24b935bd1 Mon Sep 17 00:00:00 2001 From: YBP Date: Thu, 19 Mar 2026 09:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AE=B0=E5=BD=95-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9BuG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recordrecord/RecordRecordServiceImpl.java | 50 ++----------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java index 2764ab7d..9c4b7967 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/record/service/recordrecord/RecordRecordServiceImpl.java @@ -1,8 +1,6 @@ package com.zt.plat.module.qms.resource.record.service.recordrecord; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.jwt.JWT; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -15,13 +13,9 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; -import com.zt.plat.module.infra.api.businessfile.BusinessFileApi; -import com.zt.plat.module.infra.api.file.FileApi; -import com.zt.plat.module.infra.api.file.dto.FileRespDTO; import com.zt.plat.module.qms.common.service.BusinessFileService; import com.zt.plat.module.qms.resource.record.common.RecordCommonUtils; import com.zt.plat.module.qms.resource.record.constant.RecordConstants; -import com.zt.plat.module.qms.common.onlyOffice.controller.vo.OnlyOfficeEditorConfigRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordPageReqVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordRespVO; import com.zt.plat.module.qms.resource.record.controller.admin.recordrecord.vo.RecordRecordSaveReqVO; @@ -31,12 +25,9 @@ import com.zt.plat.module.qms.resource.record.dal.dataobject.recordrecord.Record import com.zt.plat.module.qms.resource.record.dal.mapper.RecordRecordMapper; import com.zt.plat.module.qms.resource.record.service.recordcategory.RecordCategoryService; import com.zt.plat.module.qms.resource.record.service.recordpermission.RecordPermissionService; -import com.zt.plat.module.system.api.user.AdminUserApi; -import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -48,7 +39,6 @@ import java.util.List; import java.util.Optional; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.module.infra.enums.ErrorCodeConstants.DOC_NOT_EXISTS; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; /** @@ -100,38 +90,6 @@ public class RecordRecordServiceImpl implements RecordRecordService { LocalDateTime effectiveDate = recordRecord.getEffectiveDate(); LocalDateTime expirationDate = recordRecord.getExpirationDate(); - // if (!ObjectUtils.isEmpty(customConfig)) { - // JSONObject jsonObject = JSONObject.parseObject(customConfig, JSONObject.class); - // Integer submitFlag = jsonObject.getInteger("submitFlag"); - // if (submitFlag == 0){ - // if (effectiveDate == null) recordRecord.setRecordStatus(1); // 立即生效 - // else if (effectiveDate.isAfter(LocalDateTime.now())) { - // recordRecord.setRecordStatus(3); // 当前日期 < 生效日期，待生效 - // } else if (effectiveDate.isBefore(LocalDateTime.now()) || effectiveDate.isEqual(LocalDateTime.now())) { - // if (expirationDate.isAfter(LocalDateTime.now())) { - // recordRecord.setRecordStatus(1); // 生效日期 ≤ 当前日期 < 过期日期，生效中 - // } else { - // recordRecord.setRecordStatus(0); // 当前日期 ≥ 过期日期，已过期 - // } - // } else { - // recordRecord.setRecordStatus(0); // 默认已过期 - // } - // } - // }else { - // // 判断是否生效 - // if (effectiveDate == null) recordRecord.setRecordStatus(1); // 立即生效 - // else if (effectiveDate.isAfter(LocalDateTime.now())) { - // recordRecord.setRecordStatus(3); // 当前日期 < 生效日期，待生效 - // } else if (effectiveDate.isBefore(LocalDateTime.now()) || effectiveDate.isEqual(LocalDateTime.now())) { - // if (expirationDate.isAfter(LocalDateTime.now())) { - // recordRecord.setRecordStatus(1); // 生效日期 ≤ 当前日期 < 过期日期，生效中 - // } else { - // recordRecord.setRecordStatus(0); // 当前日期 ≥ 过期日期，已过期 - // } - // } else { - // recordRecord.setRecordStatus(0); // 默认已过期 - // } - // } if (ObjectUtils.isEmpty(customConfig)) { //不需要提交，判断状态 int sts = calculateRecordStatus(effectiveDate, expirationDate); recordRecord.setRecordStatus(sts); @@ -165,13 +123,13 @@ public class RecordRecordServiceImpl implements RecordRecordService { } // 生效日期 ≤ 当前日期，判断是否过期 - if (effectiveDate.isBefore(now) || effectiveDate.isEqual(now)) { + if (effectiveDate.isBefore(now)) { // 当前日期 < 过期日期，生效中 - if (expirationDate != null && expirationDate.isAfter(now)) { - return 1; + if (expirationDate != null && expirationDate.isBefore(now)) { + return 0; } // 当前日期 ≥ 过期日期，已过期 - return 0; + return 1; } // 默认已过期