From 9f9434ddcab7c7983c2557cf12f10a9d89de59a9 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 9 Aug 2022 09:15:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index f2bc6ff04..094e2f5ee 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -294,9 +294,9 @@ if (res.success) { this.formInline = res.result || {} this.formInline = { ...this.formInline } - if (this.formInline.showPermissions == 'Privacy'){ + if (this.formInline.showPermissions == 'Privacy') { this.isDisplay = true - }else{ + } else { this.isDisplay = false } } else { @@ -332,7 +332,7 @@ , onEditorChange({ quill, html, text }) { console.log('editor change!', quill, html, text) - this.content = html + this.formInline.content = html } , PersonnelSelectionChange(value, id) { From ec24b084e6163f8fc39e2fa60c8948cb0bcfc608 Mon Sep 17 00:00:00 2001 From: gaosong Date: Tue, 9 Aug 2022 09:45:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94-=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=92=8C=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareItemCommentController.java | 11 +++--- .../SarFileCompareResCommentController.java | 14 ++------ .../ISarFileCompareItemCommentService.java | 4 +-- .../ISarFileCompareResCommentService.java | 3 +- .../SarFileCompareItemCommentServiceImpl.java | 35 +++++++------------ .../SarFileCompareResCommentServiceImpl.java | 3 +- 6 files changed, 25 insertions(+), 45 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index a7a90f28b..651006e93 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -21,7 +21,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; -import java.util.Map; /** @@ -162,10 +161,12 @@ public class SarFileCompareItemCommentController extends JeroController exportResXls(@RequestParam Map map, - HttpServletResponse response, - HttpServletRequest request) { - sarFileCompareItemCommentService.exportResXls(map, response, request); + public Result exportResXls(@RequestParam(name = "infoId", required = true) String infoId, + @RequestParam(name = "selectIds", required = true) String selectIds, + @RequestParam(name = "includeComments", required = true) boolean includeComments, + @RequestParam(name = "cut", required = true) String cut, + HttpServletResponse response) { + sarFileCompareItemCommentService.exportResXls(response, infoId, selectIds, includeComments, cut); return Result.OK(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java index 31b1c3f8e..963a4442c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareResCommentController.java @@ -177,17 +177,9 @@ public class SarFileCompareResCommentController extends JeroController> queryListByInfoId(@RequestParam(name = "id", required = true) String id) { - List list = sarFileCompareResCommentService.queryListByInfoId(id); - return Result.OK(list); - } - - @AutoLog(value = "文档对比信息结果评论表-搜索评论") - @ApiOperation(value = "文档对比信息结果评论表-搜索评论", notes = "文档对比信息结果评论表-搜索评论") - @GetMapping(value = "/searchResComment") - public Result> searchResComment(@RequestParam(name = "id", required = true) String id, - @RequestParam(name = "str", required = true) String str) { - List list = sarFileCompareResCommentService.searchResComment(id, str); + public Result> queryListByInfoId(@RequestParam(name = "id", required = true) String id, + @RequestParam(name = "str") String str) { + List list = sarFileCompareResCommentService.queryListByInfoId(id, str); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java index 2f424c83b..ab20bcc9c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java @@ -67,7 +67,5 @@ public interface ISarFileCompareItemCommentService extends IService map, - HttpServletResponse response, - HttpServletRequest request); + void exportResXls(HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java index 96067e89f..4d7bfa41c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareResCommentService.java @@ -60,7 +60,6 @@ public interface ISarFileCompareResCommentService extends IService queryList(); - List queryListByInfoId(String id); + List queryListByInfoId(String id, String str); - List searchResComment(String id, String str); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index 7fb64f770..9d721509b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -17,10 +17,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.text.SimpleDateFormat; @@ -170,13 +167,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl map, HttpServletResponse response, HttpServletRequest request) { - String cut = (String) map.get("cut"); - //是否包含评论 - String includeComments = (String) map.get("includeComments"); - String infoId = (String) map.get("infoId"); - String selectIds = (String) map.get("selectIds"); - + public void exportResXls(HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId); if (!StringUtils.isEmpty(selectIds)) { @@ -239,18 +230,18 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl queryListByInfoId(String id) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SarFileCompareResComment::getInfoId, id); @@ -125,7 +124,7 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl searchResComment(String id, String str) { + public List queryListByInfoId(String id, String str) { if (StringUtils.isBlank(str)) { return queryListByInfoId(id); }