From 2eee4696ad3e0bff324b9516fca530bcf8171e41 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 8 Aug 2022 10:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=AF=B9?= =?UTF-8?q?=E6=AF=94-=E6=B7=BB=E5=8A=A0=E5=AF=B9=E6=AF=94=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=85=A8=E6=96=87=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareResCommentController.java | 14 ++ .../entity/SarFileCompareResComVO.java | 59 ++++++++ .../entity/SarFileCompareResultVO.java | 9 ++ .../ISarFileCompareResCommentService.java | 3 + .../SarFileCompareItemCommentServiceImpl.java | 8 +- .../SarFileCompareResCommentServiceImpl.java | 130 ++++++++++++------ 6 files changed, 175 insertions(+), 48 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java 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 025f671f7..892eda70c 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 @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.compare.entity.SarFileCompareResComVO; import com.jero.modules.compare.entity.SarFileCompareResComment; import com.jero.modules.compare.service.ISarFileCompareResCommentService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -167,4 +168,17 @@ public class SarFileCompareResCommentController extends JeroController> queryListByInfoId(@RequestParam(name="id",required=true) String id) { + List list = sarFileCompareResCommentService.queryListByInfoId(id); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java new file mode 100644 index 000000000..f46fb8cc7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResComVO.java @@ -0,0 +1,59 @@ +package com.jero.modules.compare.entity; + +import java.util.ArrayList; +import java.util.List; + +public class SarFileCompareResComVO { + private String id; + private String name; + private String createTime; + private String content; + private List resComVoList; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public List getResComVoList() { + return resComVoList; + } + + public void setResComVoList(List resComVoList) { + this.resComVoList = resComVoList; + } + + public void addResComVo(SarFileCompareResComVO resComVo) { + if (null == this.resComVoList) { + this.resComVoList = new ArrayList<>(); + } + this.resComVoList.add(resComVo); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java index 71e34086a..9236eebf8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareResultVO.java @@ -11,6 +11,7 @@ public class SarFileCompareResultVO { private String serialNumberRight; private String fileNameRight; private List resList; + private String comments; public SarFileCompareResultVO() { } @@ -69,4 +70,12 @@ public class SarFileCompareResultVO { } this.resList.add(item); } + + public String getComments() { + return comments; + } + + public void setComments(String comments) { + this.comments = comments; + } } 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 ad53c87c8..445eb8771 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 @@ -1,5 +1,6 @@ package com.jero.modules.compare.service; +import com.jero.modules.compare.entity.SarFileCompareResComVO; import com.jero.modules.compare.entity.SarFileCompareResComment; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +59,6 @@ public interface ISarFileCompareResCommentService extends IService queryList(); + + List queryListByInfoId(String id); } 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 71b4dec8d..60ecb484c 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 @@ -67,9 +67,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl list = queryListByInfoId(infoId); Map sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java index c77ce0609..fc69ae105 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareResCommentServiceImpl.java @@ -1,29 +1,37 @@ package com.jero.modules.compare.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.compare.entity.SarFileCompareResComVO; import com.jero.modules.compare.entity.SarFileCompareResComment; import com.jero.modules.compare.mapper.SarFileCompareResCommentMapper; import com.jero.modules.compare.service.ISarFileCompareResCommentService; +import com.jero.modules.system.util.StringUtils; import org.springframework.stereotype.Service; -import java.util.List; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 文档对比信息结果评论表 * @Author: jero-boot - * @Date: 2022-08-05 + * @Date: 2022-08-05 * @Version: V1.0 */ @Service public class SarFileCompareResCommentServiceImpl extends ServiceImpl implements ISarFileCompareResCommentService { - /** - * 保存 - * - * @param sarFileCompareResComment - * @return - */ - @Override + private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + /** + * 保存 + * + * @param sarFileCompareResComment + * @return + */ + @Override public void add(SarFileCompareResComment sarFileCompareResComment) { Date now = new Date(); sarFileCompareResComment.setCreateTime(now); @@ -31,59 +39,91 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public SarFileCompareResComment queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } + + @Override + public List queryListByInfoId(String id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarFileCompareResComment::getInfoId, id); + queryWrapper.orderBy(true, true, SarFileCompareResComment::getCreateTime); + List resList = new ArrayList<>(); + List list = this.list(queryWrapper); + for (SarFileCompareResComment rc : list) { + if (StringUtils.isEmpty(rc.getParentId())) { + SarFileCompareResComVO resComVO = wrapperSarFileCompareResComVO(rc); + for (SarFileCompareResComment rc1 : list) { + if (!StringUtils.isEmpty(rc.getParentId()) && rc.getParentId().equals(resComVO.getId())) { + resComVO.addResComVo(wrapperSarFileCompareResComVO(rc1)); + } + } + resList.add(resComVO); + } + } + return resList; + } + + private SarFileCompareResComVO wrapperSarFileCompareResComVO(SarFileCompareResComment rc) { + SarFileCompareResComVO resComVO = new SarFileCompareResComVO(); + resComVO.setId(rc.getId()); + resComVO.setName(rc.getCreateBy()); + resComVO.setCreateTime(sdf.format(rc.getCreateTime())); + resComVO.setContent(rc.getComment()); + return resComVO; + } + + }