diff --git a/src/main/java/com/gxwebsoft/ai/controller/AuditReportController.java b/src/main/java/com/gxwebsoft/ai/controller/AuditReportController.java index ec8a757..e12a7af 100644 --- a/src/main/java/com/gxwebsoft/ai/controller/AuditReportController.java +++ b/src/main/java/com/gxwebsoft/ai/controller/AuditReportController.java @@ -113,12 +113,12 @@ public class AuditReportController extends BaseController { // 准备模板数据 Map map = new HashMap<>(); map.put(AuditReportEnum.AUDIT_TITLE.getCode().toString(), req.getFrom0()); - map.put(AuditReportEnum.AUDIT_BASIS.getCode().toString(), req.getFrom1()); - map.put(AuditReportEnum.AUDIT_OBJECTIVE.getCode().toString(), req.getFrom2()); - map.put(AuditReportEnum.AUDIT_SCOPE.getCode().toString(), req.getFrom3()); - map.put(AuditReportEnum.UNIT_OVERVIEW.getCode().toString(), req.getFrom41()); - map.put(AuditReportEnum.ORG_AND_PERSONNEL.getCode().toString(), req.getFrom42()); - map.put(AuditReportEnum.AUDIT_CONTENT_METHODS.getCode().toString(), req.getFrom5()); + map.put(AuditReportEnum.AUDIT_BASIS.getCode().toString(), convertNewlines(req.getFrom1())); + map.put(AuditReportEnum.AUDIT_OBJECTIVE.getCode().toString(), convertNewlines(req.getFrom2())); + map.put(AuditReportEnum.AUDIT_SCOPE.getCode().toString(), convertNewlines(req.getFrom3())); + map.put(AuditReportEnum.UNIT_OVERVIEW.getCode().toString(), convertNewlines(req.getFrom41())); + map.put(AuditReportEnum.ORG_AND_PERSONNEL.getCode().toString(), convertNewlines(req.getFrom42())); + map.put(AuditReportEnum.AUDIT_CONTENT_METHODS.getCode().toString(), convertNewlines(req.getFrom5())); // 使用Easypoi的Word模板功能 XWPFDocument document = WordExportUtil.exportWord07(templateConfig.getWordTemplatePath(), map); @@ -141,4 +141,14 @@ public class AuditReportController extends BaseController { } } + /** + * 将文本中的 \n\n 转换为Word可识别的换行格式 + */ + private String convertNewlines(String text) { + if (text == null) { + return ""; + } + String line = System.getProperty("line.separator"); + return text.replace("\n\n", line).replace("\n", line); + } } diff --git a/src/main/java/com/gxwebsoft/oa/controller/OaCompanyController.java b/src/main/java/com/gxwebsoft/oa/controller/OaCompanyController.java index 338baad..acfa344 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/OaCompanyController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/OaCompanyController.java @@ -2,6 +2,9 @@ package com.gxwebsoft.oa.controller; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.oa.service.OaCompanyService; + +import cn.hutool.core.util.StrUtil; + import com.gxwebsoft.oa.entity.OaCompany; import com.gxwebsoft.oa.param.OaCompanyParam; import com.gxwebsoft.common.core.web.ApiResult; @@ -61,6 +64,15 @@ public class OaCompanyController extends BaseController { @PostMapping() public ApiResult save(@RequestBody OaCompany oaCompany) { if (oaCompanyService.save(oaCompany)) { + //TODO 查询知识库(kb_name=enterprise.getCreditCode) + + //TODO 新建知识库 + String kbId = "pggi9mpair"; + + //绑定知识库 + oaCompany.setKbId(kbId); + oaCompanyService.updateById(oaCompany); + return success("添加成功"); } return fail("添加失败"); @@ -69,6 +81,15 @@ public class OaCompanyController extends BaseController { @Operation(summary = "修改企业信息") @PutMapping() public ApiResult update(@RequestBody OaCompany oaCompany) { + if(StrUtil.isEmpty(oaCompany.getKbId())) { + //TODO 查询知识库 + + //TODO 新建知识库 + String kbId = "pggi9mpair"; + + //绑定知识库 + oaCompany.setKbId(kbId); + } if (oaCompanyService.updateById(oaCompany)) { return success("修改成功"); } diff --git a/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java b/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java index 20b3335..e783740 100644 --- a/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java +++ b/src/main/java/com/gxwebsoft/pwl/entity/PwlProject.java @@ -175,6 +175,9 @@ public class PwlProject implements Serializable { @TableField(exist = false) private String phone; + @Schema(description = "知识库ID") + private String kbId; + @Schema(description = "租户id") private Integer tenantId; diff --git a/src/main/resources/templates/audit_report_template.docx b/src/main/resources/templates/audit_report_template.docx index 0608b9d..e964b36 100644 Binary files a/src/main/resources/templates/audit_report_template.docx and b/src/main/resources/templates/audit_report_template.docx differ