diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index a8c13f5..b0a648e 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -1,14 +1,10 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; +import org.qinan.safetyeval.client.dto.*; import io.swagger.annotations.ApiOperation; import org.qinan.safetyeval.client.api.QualFilingChangeApi; import org.qinan.safetyeval.client.co.QualFilingChangeCO; -import org.qinan.safetyeval.client.dto.QualFilingChangeAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingChangeModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingChangePageQuery; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -84,7 +80,7 @@ public class QualFilingChangeController { @ApiOperation("变更审核打回") @PostMapping("/reject") - public SingleResponse reject(@Validated @RequestBody org.qinan.safetyeval.client.dto.QualFilingRejectCmd cmd) { + public SingleResponse reject(@Validated @RequestBody QualFilingRejectCmd cmd) { return qualFilingChangeApi.reject(cmd); } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingMaterialGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingMaterialGatewayImpl.java index 59023e5..af184c2 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingMaterialGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingMaterialGatewayImpl.java @@ -10,6 +10,7 @@ import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.infrastructure.dataobject.QualFilingMaterialDO; import org.qinan.safetyeval.infrastructure.mapper.QualFilingMaterialMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -108,6 +109,7 @@ public class QualFilingMaterialGatewayImpl implements QualFilingMaterialGateway dataObject.setAttachmentDesc(entity.getAttachmentDesc()); dataObject.setAttachmentUrl(entity.getAttachmentUrl()); dataObject.setMaterialRemark(entity.getMaterialRemark()); + dataObject.setMaterialType(entity.getMaterialType()); dataObject.setTenantId(entity.getTenantId()); return dataObject; } @@ -128,6 +130,7 @@ public class QualFilingMaterialGatewayImpl implements QualFilingMaterialGateway entity.setAttachmentDesc(dataObject.getAttachmentDesc()); entity.setAttachmentUrl(dataObject.getAttachmentUrl()); entity.setMaterialRemark(dataObject.getMaterialRemark()); + entity.setMaterialType(dataObject.getMaterialType()); entity.setTenantId(dataObject.getTenantId()); return entity; }