diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java index f96d29a..7cccef5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java @@ -1,5 +1,9 @@ package com.zt.plat.module.qms.business.bus.controller.admin; + +import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataPageReqVO; +import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataRespVO; +import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataSaveReqVO; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -10,7 +14,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -20,9 +23,8 @@ import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; import static com.zt.plat.framework.common.pojo.CommonResult.success; - +import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.module.qms.business.bus.controller.vo.*; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigReportTemplateServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigReportTemplateServiceImpl.java index 6ac4e9f..872bf08 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigReportTemplateServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/service/ConfigReportTemplateServiceImpl.java @@ -17,9 +17,10 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.qms.business.config.dal.mapper.ConfigReportTemplateMapper; +import com.zt.plat.module.qms.enums.QmsCommonConstant; +import com.zt.plat.module.qms.framework.gridreport.GridReport; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; /** @@ -39,9 +40,10 @@ public class ConfigReportTemplateServiceImpl implements ConfigReportTemplateServ // 插入 ConfigReportTemplateDO configReportTemplate = BeanUtils.toBean(createReqVO, ConfigReportTemplateDO.class); String content = configReportTemplate.getContent(); - if (content.startsWith("_WR_")) { + if (content.startsWith(GridReport.WR_PREFIX)) { configReportTemplate.setIsAuthority(1); } + configReportTemplate.setIsLast(QmsCommonConstant.YES); configReportTemplateMapper.insert(configReportTemplate); // 返回 @@ -55,7 +57,7 @@ public class ConfigReportTemplateServiceImpl implements ConfigReportTemplateServ // 更新 ConfigReportTemplateDO updateObj = BeanUtils.toBean(updateReqVO, ConfigReportTemplateDO.class); String content = updateObj.getContent(); - if (content.startsWith("_WR_")) { + if (content.startsWith(GridReport.WR_PREFIX)) { updateObj.setIsAuthority(1); } configReportTemplateMapper.updateById(updateObj);