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); } } 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 fc69ae105..1a46d8fa1 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 @@ -106,7 +106,7 @@ public class SarFileCompareResCommentServiceImpl extends ServiceImpl 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..59bd50731 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,8 @@ public class ProblemKnowledgeBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + this.problemKnowledgeBaseEOService.createQueryPermission(queryWrapper); + 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/entity/ProblemKnowledgeBaseUserEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java index 4865c5bdd..0faa4094e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.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; @@ -70,5 +71,8 @@ public class ProblemKnowledgeBaseUserEO implements Serializable { @Excel(name = "用户id", width = 15) @ApiModelProperty(value = "用户id") private java.lang.String userId; + /**用户姓名*/ + @TableField(exist = false) + private String userName; } 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/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java index 93645bb8f..b62c1331a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.problemKnowledgeBase.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -68,4 +69,10 @@ public interface IProblemKnowledgeBaseEOService extends IService datas,String cut); + + /** + * 创建查询权限 + * @param queryWrapper + */ + void createQueryPermission(QueryWrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java index 6a1521524..a3086262e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java @@ -58,4 +58,11 @@ public interface IProblemKnowledgeBaseUserEOService extends IService queryList(); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas,String cut); } 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..57a0f9ada 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,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl queryList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + this.createQueryPermission(queryWrapper); + queryWrapper.orderByDesc("create_time"); List result = this.list(queryWrapper); this.disposeData(result,problemKnowledgeBaseEO.getCut()); return result; @@ -181,6 +183,12 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl collectEOList = this.problemKnowledgeBaseCollectEOService.list(collectQueryWrapper); + //查询出数据的所有的权限用户 + QueryWrapper permissionUserQueryWrapper = new QueryWrapper<>(); + permissionUserQueryWrapper.lambda().in(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId,probleKnowledgeBaseIdList); + List permissionUserEOList = this.problemKnowledgeBaseUserEOService.list(permissionUserQueryWrapper); + this.problemKnowledgeBaseUserEOService.disposeData(permissionUserEOList,cut); + datas.forEach(data -> { if(StringUtils.isNotEmpty(data.getShowPermissions())){ data.setShowPermissions_dicText(ShowPermissionsEnum.getTextByValue(data.getShowPermissions(),cut)); @@ -238,7 +246,42 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl permissionUserEOS = permissionUserEOList.stream().filter(permissionUserEO -> { + boolean flag = false; + if (StringUtils.equals(data.getId(), permissionUserEO.getProblemKnowledgeBaseId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionUserEOS)){ + data.setPermissionUserList(permissionUserEOS); + } }); } } + + @Override + public void createQueryPermission(QueryWrapper queryWrapper) { + /** + * 查询权限 + * 公开：所有人都可以看到。 + * 私密：只有配置了的权限用户可以看到。 + */ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); + userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentUser.getId()); + List problemKnowledgeBaseUserEOList = problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); + + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + + queryWrapper.lambda().and(query -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()). + or(o -> { + o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); + o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); + }); + }); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java index f5f56bd8e..4f3679dcf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java @@ -3,9 +3,16 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseUserEOMapper; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,6 +27,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseUserEOService { + @Autowired + private ISysUserService sysUserService; + /** * 保存 * @@ -89,4 +99,30 @@ public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List userIdList = datas.stream().map(ProblemKnowledgeBaseUserEO::getUserId).distinct().collect(Collectors.toList()); + + List userList = sysUserService.querySysUserListByIdList(userIdList); + + datas.forEach(data -> { + if(CollectionUtils.isNotEmpty(userList)){ + String userName = ""; + for (SysUser user : userList) { + if (StringUtils.equals(data.getUserId(), user.getId())) { + userName = user.getUsername(); + break; + } + } + + if(StringUtils.isNotEmpty(userName)){ + data.setUserName(userName); + } + } + }); + + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 4401d668d..9b92dc342 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -132,14 +132,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId()); + iNewOpinionTemplateEOService.remove(wrapper); + //新增 List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); - iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList); + iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ - //新发布标准清单模板 + //新发布标准清单模板(先删除在新增) + //删除 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId()); + iNewStandardTemplateEOService.remove(lambdaQueryWrapper); + //新增 List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); - iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList); + iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); } } diff --git a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue index d670543d8..06eac92d7 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/commentList.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/commentList.vue @@ -36,8 +36,8 @@ -
-
+
+
@@ -97,7 +97,7 @@