Commit 90a1ad8b authored by alex yao's avatar alex yao

fix(software_copyright): 修复文档类型参数保存

parent 53a92860
...@@ -28,10 +28,11 @@ public interface SoftwareCopyRightService { ...@@ -28,10 +28,11 @@ public interface SoftwareCopyRightService {
* @param baseInfo 软著基本信息 * @param baseInfo 软著基本信息
* @param technicalContent 软著技术内容 * @param technicalContent 软著技术内容
* @param referenceDocumentFileUrl 参考文件 * @param referenceDocumentFileUrl 参考文件
* @param generatedDocType 生成文档类型
*/ */
BizSoftwareCopyrightEntity save(BaseInfo baseInfo, TechnicalContent technicalContent, BizSoftwareCopyrightEntity save(BaseInfo baseInfo, TechnicalContent technicalContent,
List<String> referenceDocumentFileUrl); List<String> referenceDocumentFileUrl, List<String> generatedDocType);
/** /**
* 软著AI助手 * 软著AI助手
* *
...@@ -88,7 +89,7 @@ public interface SoftwareCopyRightService { ...@@ -88,7 +89,7 @@ public interface SoftwareCopyRightService {
* @return 软著列表 * @return 软著列表
*/ */
List<BizSoftwareCopyrightEntity> querySoftwareCopyRight(String query, String generatedStatus, List<BizSoftwareCopyrightEntity> querySoftwareCopyRight(String query, String generatedStatus,
PagingInfo pagingInfo); PagingInfo pagingInfo);
/** /**
* 回调-生成基础文档 * 回调-生成基础文档
......
...@@ -90,13 +90,14 @@ public class SoftwareCopyRightServiceImpl implements SoftwareCopyRightService { ...@@ -90,13 +90,14 @@ public class SoftwareCopyRightServiceImpl implements SoftwareCopyRightService {
@Override @Override
public BizSoftwareCopyrightEntity save(BaseInfo baseInfo, TechnicalContent technicalContent, public BizSoftwareCopyrightEntity save(BaseInfo baseInfo, TechnicalContent technicalContent,
List<String> referenceDocumentFileUrl) { List<String> referenceDocumentFileUrl, List<String> generatedDocType) {
BizSoftwareCopyrightEntity entity = new BizSoftwareCopyrightEntity(); BizSoftwareCopyrightEntity entity = new BizSoftwareCopyrightEntity();
entity.setBaseInfo(JsonUtils.serialize(baseInfo)); entity.setBaseInfo(JsonUtils.serialize(baseInfo));
entity.setTechnicalContent(JsonUtils.serialize(technicalContent)); entity.setTechnicalContent(JsonUtils.serialize(technicalContent));
if (CollectionUtils.isNotEmpty(referenceDocumentFileUrl)) { if (CollectionUtils.isNotEmpty(referenceDocumentFileUrl)) {
entity.setReferenceDocumentFileUrl(JsonUtils.serialize(referenceDocumentFileUrl)); entity.setReferenceDocumentFileUrl(JsonUtils.serialize(referenceDocumentFileUrl));
} }
entity.setGeneratedDocType(JsonUtils.serialize(generatedDocType));
return bizSoftwareCopyrightService.save(entity); return bizSoftwareCopyrightService.save(entity);
} }
......
...@@ -47,11 +47,13 @@ public class BizSoftwareCopyrightRestImpl implements BizSoftwareCopyrightRest { ...@@ -47,11 +47,13 @@ public class BizSoftwareCopyrightRestImpl implements BizSoftwareCopyrightRest {
Assert.notNull(dto); Assert.notNull(dto);
Assert.notNull(dto.getBaseInfo(), "基础信息不能为空"); Assert.notNull(dto.getBaseInfo(), "基础信息不能为空");
Assert.notNull(dto.getTechnicalContent(), "技术内容不能为空"); Assert.notNull(dto.getTechnicalContent(), "技术内容不能为空");
Assert.notNull(dto.getGeneratedDocType(), "文档类型不能为空");
return BizSoftwareCopyrightConvert.entityToDto( return BizSoftwareCopyrightConvert.entityToDto(
softwareCopyRightService.save( softwareCopyRightService.save(
dto.getBaseInfo(), dto.getBaseInfo(),
dto.getTechnicalContent(), dto.getTechnicalContent(),
dto.getReferenceDocumentFileUrl()) dto.getReferenceDocumentFileUrl(),
dto.getGeneratedDocType())
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment