From e48068c3ec72f0aff24a6e959ba9ce782b543dc1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 8 Aug 2022 12:01:36 +0800 Subject: [PATCH 1/8] =?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=AF=94=E5=AF=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareInfoController.java | 15 ++++++++---- .../compare/entity/SarFileCompareInfo.java | 5 ++++ .../compare/enums/ComparesInfoStateEnum.java | 24 ------------------- .../impl/SarFileCompareInfoServiceImpl.java | 2 +- 4 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index d843c6a97..90b53ed10 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -54,12 +54,16 @@ public class SarFileCompareInfoController extends JeroController queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + public Result queryPageList(SarFileCompareInfo sarFileCompareInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "cut", defaultValue = "cn") String cut, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sarFileCompareInfo, req.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); queryWrapper.eq("create_by", sysUser.getUsername()).or().eq("release_state", ReleaseConditionEnum.DRAFT.getValue()); Page page = new Page(pageNo, pageSize); IPage pageList = sarFileCompareInfoService.page(page, queryWrapper); + for (SarFileCompareInfo info : pageList.getRecords()) { + info.setReleaseStateTitle(ReleaseConditionEnum.getTextByValue(info.getReleaseState(), cut)); + } return Result.OK(pageList); } @@ -208,12 +212,13 @@ public class SarFileCompareInfoController extends JeroController changeState(@Validated @RequestBody SarFileCompareInfo sarFileCompareInfo) { - if (sarFileCompareInfo.getReleaseState().equals(ReleaseConditionEnum.DRAFT.getValue())) { - sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.PUBLISHED.getValue()); + SarFileCompareInfo info = sarFileCompareInfoService.queryById(sarFileCompareInfo.getId()); + if (ReleaseConditionEnum.DRAFT.getValue().equals(sarFileCompareInfo.getReleaseState())) { + info.setReleaseState(ReleaseConditionEnum.PUBLISHED.getValue()); } else { - sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.DRAFT.getValue()); + info.setReleaseState(ReleaseConditionEnum.DRAFT.getValue()); } - sarFileCompareInfoService.editById(sarFileCompareInfo); + sarFileCompareInfoService.editById(info); return Result.OK("更改成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java index 7760d639c..81f9d00e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -126,6 +127,10 @@ public class SarFileCompareInfo implements Serializable { @ApiModelProperty(value = "发布状态") private String releaseState; + /**发布状态-翻译后*/ + @TableField(exist = false) + private String releaseStateTitle; + /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java deleted file mode 100644 index fa94f0621..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/enums/ComparesInfoStateEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jero.modules.compare.enums; - -/** - * 对比信息发布状态 - */ -public enum ComparesInfoStateEnum { - DRAFT(0, "草稿"), RELEASE(1, "发布"); - - private int value; - private String lable; - - private ComparesInfoStateEnum(int value, String lable) { - this.value = value; - this.lable = lable; - } - - public int getValue() { - return value; - } - - public String getLable() { - return lable; - } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index e16cd6be7..e0dfcc381 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -160,7 +160,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl= rightItemList.size() - 1) { int ts = leftItemList.get(i).getTargetStand(); - if(ts > -1){ + if (ts > -1) { rightItemList.get(ts).setTargetStand(i); } } From 9d62cab5b379305fdc5019a1090cea072ed67a2e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 13:53:58 +0800 Subject: [PATCH 2/8] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86=E5=8F=91?= =?UTF-8?q?=E5=B8=83-=E5=8F=91=E5=B8=83=E6=88=96=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CountryCardManageReleaseEOController.java | 15 +++++++++++++++ .../controller/CountryCardTempEOController.java | 1 + ...roblemKnowledgeBaseClassifyEOController.java | 1 + ...ProblemKnowledgeBaseCommentEOController.java | 1 + .../ProblemKnowledgeBaseEOController.java | 1 + .../entity/CountryCardTempEO.java | 2 ++ .../enums/ReleaseStatusEnum.java | 4 ++-- .../ICountryCardManageReleaseEOService.java | 7 +++++++ .../CountryCardManageReleaseEOServiceImpl.java | 17 +++++++++++++++++ .../impl/CountryCardTempEOServiceImpl.java | 5 +++++ ...roblemKnowledgeBaseCommentEOServiceImpl.java | 1 + .../impl/ProblemKnowledgeBaseEOServiceImpl.java | 1 + 12 files changed, 54 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 8887cd8ed..ae2e63e86 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -170,4 +172,17 @@ public class CountryCardManageReleaseEOController extends JeroController batchUpdateReleaseStatus(@RequestBody JSONObject json) { + this.countryCardManageReleaseEOService.batchUpdateReleaseStatus(json); + return Result.OK("批量更新发布状态成功!"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java index 9c56a1552..ef2defe57 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardTempEOController.java @@ -54,6 +54,7 @@ public class CountryCardTempEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempEO, req.getParameterMap()); + queryWrapper.orderByAsc("order_num"); Page page = new Page(pageNo, pageSize); IPage pageList = countryCardTempEOService.page(page, queryWrapper); this.countryCardTempEOService.disposeData(pageList.getRecords(),countryCardTempEO.getCut()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java index 40bc6cf3e..54aa4c3e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java @@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseClassifyEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = problemKnowledgeBaseClassifyEOService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java index 866729479..761643473 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseCommentEOController.java @@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseCommentEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = problemKnowledgeBaseCommentEOService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java index 8a991b3c4..6441dc9e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = problemKnowledgeBaseEOService.page(page, queryWrapper); this.problemKnowledgeBaseEOService.disposeData(pageList.getRecords(),problemKnowledgeBaseEO.getCut()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java index 8bf7c2d28..39556fd61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardTempEO.java @@ -73,6 +73,8 @@ public class CountryCardTempEO implements Serializable { @Excel(name = "标签类型", width = 15) @ApiModelProperty(value = "标签类型") private java.lang.String lableType; + @TableField(exist = false) + private java.lang.String lableType_dicText; /**展示顺序*/ @Excel(name = "展示顺序", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java index 5684cf326..bf1ecd1f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/enums/ReleaseStatusEnum.java @@ -8,8 +8,8 @@ import org.apache.commons.lang3.StringUtils; */ public enum ReleaseStatusEnum { - HAVE_RELEASED("已发布","Have released","have released"), - DRAFT("草稿","Draft","draft"), + HAVE_RELEASED("已发布","Have released","Have released"), + DRAFT("草稿","Draft","Draft"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index e0de0375f..68de81566 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.problemKnowledgeBase.service; +import com.alibaba.fastjson.JSONObject; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -65,4 +66,10 @@ public interface ICountryCardManageReleaseEOService extends IService datas, String cut); + + /** + * 批量更新发布状态 + * @param json + */ + void batchUpdateReleaseStatus(JSONObject json); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index 0c3b70a06..a0a0f6c04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -142,4 +144,19 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(CountryCardManageReleaseEO::getId,Arrays.asList(ids.split(","))); + List countryCardManageReleaseEOList = this.list(queryWrapper); + countryCardManageReleaseEOList.forEach(countryCardManageReleaseEO -> { + countryCardManageReleaseEO.setReleaseStatus(releaseStatus); + }); + + this.updateBatchById(countryCardManageReleaseEOList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java index f1fcbe2e5..e19bd2024 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardTempEOServiceImpl.java @@ -118,6 +118,7 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl queryList(CountryCardTempEO countryCardTempEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardTempEO, req.getParameterMap()); + queryWrapper.orderByAsc("order_num"); List result = this.list(queryWrapper); return result; } @@ -144,6 +145,10 @@ public class CountryCardTempEOServiceImpl extends ServiceImpl queryList(ProblemKnowledgeBaseCommentEO problemKnowledgeBaseCommentEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseCommentEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); List result = this.list(queryWrapper); return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 06583b4e9..d6c5e73ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -129,6 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl queryList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); List result = this.list(queryWrapper); this.disposeData(result,problemKnowledgeBaseEO.getCut()); return result; From be6895629402a0dfe474739fdc134471d2ebd900 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 14:08:39 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/commentList.vue | 35 ++-- .../components/comparisonResults.vue | 184 ++++++++++++------ .../components/documentDataComparison.vue | 65 +++++-- .../documentComparison/index.vue | 27 ++- 4 files changed, 216 insertions(+), 95 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index d670543d8..6a2b663b4 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -26,11 +26,11 @@
- {{item.name}} + {{item.createBy}} {{item.createTime}}
- {{item.content}} + {{item.comment}}
@@ -42,11 +42,11 @@
- {{val.name}} + {{val.createBy}} {{val.createTime}}
- {{val.content}} + {{val.comment}}
@@ -97,7 +97,7 @@