From e48068c3ec72f0aff24a6e959ba9ce782b543dc1 Mon Sep 17 00:00:00 2001 From: gaosong Date: Mon, 8 Aug 2022 12:01:36 +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-=E4=BF=AE=E6=94=B9=E6=AF=94=E5=AF=B9=E4=BF=A1?= =?UTF-8?q?=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); } }