diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 1af897f..3a541b5 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -111,6 +111,11 @@ READ_WRITER_NOT_CONNECTED_OR_NO_TID(2418, "连接读写器失败或无可识别标签"), /** + * 质量模块 + */ + QUALITY_NON_REVIEW_FORM_IS_NULL(2501,"内部审核不符合项报告为空"), + + /** * 表单生成及打印 */ MODULE_CONFIG_PRINT(2700, "模板文件配置为空"), diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 1af897f..3a541b5 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -111,6 +111,11 @@ READ_WRITER_NOT_CONNECTED_OR_NO_TID(2418, "连接读写器失败或无可识别标签"), /** + * 质量模块 + */ + QUALITY_NON_REVIEW_FORM_IS_NULL(2501,"内部审核不符合项报告为空"), + + /** * 表单生成及打印 */ MODULE_CONFIG_PRINT(2700, "模板文件配置为空"), diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java index ef5fb42..3cb524e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonReviewFormServiceImpl.java @@ -15,10 +15,12 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.quality.BizQualityNonReviewFormVO; import com.casic.missiles.dto.quality.approval.BizQualityNonReviewFormApprovalVO; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.quality.QualityDictTypeEnum; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.quality.BizQualityNonReviewFormMapper; import com.casic.missiles.model.quality.BizQualityInternalAuditRep; import com.casic.missiles.model.quality.BizQualityNonReviewFile; @@ -38,6 +40,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; @@ -147,8 +150,11 @@ @Override public void exportFile(ExportDTO exportDTO, HttpServletResponse response) { BizQualityNonReviewForm bizQualityNonReviewForm = this.baseMapper.selectById(exportDTO.getId()); + if (ObjectUtils.isEmpty(bizQualityNonReviewForm)) { + throw new BusinessException(BusinessExceptionEnum.QUALITY_NON_REVIEW_FORM_IS_NULL); + } String deptName = permissionContext.getDeptService().getDeptName(bizQualityNonReviewForm.getDeptId()); - if (StringUtils.isNotBlank(deptName)){ + if (StringUtils.isNotBlank(deptName)) { bizQualityNonReviewForm.setDeptName(deptName); } try { @@ -160,10 +166,8 @@ if (ObjectUtil.isNotEmpty(user)) { bizQualityNonReviewForm.setAuditLeaderName(user.getName()); } - if (ObjectUtil.isNotEmpty(bizQualityNonReviewForm)) { - Map map = BeanUtil.beanToMap(bizQualityNonReviewForm); - printFileRegister.registerPrintFile(QUALITY_NON_REVIEW_REPORT, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); - } + Map map = BeanUtil.beanToMap(bizQualityNonReviewForm); + printFileRegister.registerPrintFile(QUALITY_NON_REVIEW_REPORT, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } @Transactional