From 74ab2f188d302f3c512833fd6468d20dc51193d1 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Sep 2023 16:02:36 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=B8=B4=E6=97=B6=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=94=B9=E5=AE=8C=E6=8C=89=E6=A0=87=E5=87=86?= =?UTF-8?q?id=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 45 ++++++++++++++++--- .../entity/EnterpriseStandardAuthDept.java | 18 ++++---- .../entity/EnterpriseStandardAuthUser.java | 6 +-- .../xml/EnterpriseStandardAuthDeptMapper.xml | 4 +- .../xml/EnterpriseStandardAuthUserMapper.xml | 4 +- ...EnterpriseStandardAuthDeptServiceImpl.java | 4 +- ...EnterpriseStandardAuthUserServiceImpl.java | 4 +- .../entity/LawsStandardTempPermission.java | 16 ++++--- 8 files changed, 68 insertions(+), 33 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 16c3bca2..d7fc5d29 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -148,15 +148,14 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 对返回的数据做处理 // 做字段翻译和拼接 infoPage.setRecords(processResultMapPageList(infoPage.getRecords(), fieldListSelect)); + // 企标独有权限 + if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { + // 是否能查看详情 + this.detailFlag(infoPage.getRecords()); + } // 是否收藏判断标识 collectionFlag(infoPage.getRecords()); -// // 企标独有权限 -// if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { -// // 是否能查看详情 -// this.detailFlag(infoPage.getRecords()); -// } - // 待处理 return infoPage; } @@ -241,6 +240,40 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return fieldList; } + /** + * @Author: liao + * @Date: 2023/9/11 14:49 + * @Description: 是否能进入详情页判断 + **/ + private void detailFlag(List> records) { + // 获取全部id集合 + List ids = records.stream().map(kv -> + String.valueOf(kv.get("id"))).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(ids)) return; + // 获取登录用户 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + // 查询标准收藏表 + + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsStandardCollection::getCollectorId, loginUser.getId()); + queryWrapper.in(LawsStandardCollection::getStandardId, ids); + List standardCollectionList = lawsStandardCollectionService.list(queryWrapper); + if (CollectionUtils.isEmpty(standardCollectionList)) { + records.forEach(map -> map.put(FieldCommon.COLLECTION_FLAG, false)); + return; + } + List standardIdList = standardCollectionList.stream() + .map(LawsStandardCollection::getStandardId).collect(Collectors.toList()); + records.forEach(map -> { + if (standardIdList.contains(String.valueOf(map.get("id")))) { + map.put(FieldCommon.COLLECTION_FLAG, true); + } else { + map.put(FieldCommon.COLLECTION_FLAG, false); + } + }); + } + /** * @Author: liao * @Date: 2023/9/11 14:49 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthDept.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthDept.java index 17dd4be0..4ba621bf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthDept.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthDept.java @@ -27,32 +27,32 @@ public class EnterpriseStandardAuthDept implements Serializable { /**主键ID*/ @TableId - @ApiModelProperty(value = "部门id") + @ApiModelProperty(value = "主键ID") private String id; /**创建人*/ - @ApiModelProperty(value = "部门id") + @ApiModelProperty(value = "创建人") private String createBy; /**创建时间*/ - @ApiModelProperty(value = "部门id") + @ApiModelProperty(value = "创建时间") private Date createTime; /**更新人*/ - @ApiModelProperty(value = "部门id") + @ApiModelProperty(value = "更新人") private String updateBy; /**更新时间*/ - @ApiModelProperty(value = "部门id") + @ApiModelProperty(value = "更新时间") private Date updateTime; /**所属部门*/ - @ApiModelProperty(value = "部门id") + @ApiModelProperty(value = "所属部门") private String orgCode; - /**标准编号*/ - @ApiModelProperty(value = "部门id") - private String standardNo; + /**标准Id*/ + @ApiModelProperty(value = "标准Id") + private String standardId; /**部门id*/ @ApiModelProperty(value = "部门id") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthUser.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthUser.java index b83c5b35..5fc307b8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthUser.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthUser.java @@ -57,9 +57,9 @@ public class EnterpriseStandardAuthUser implements Serializable { @ApiModelProperty(value = "所属部门") private String orgCode; - /**企标编号*/ - @ApiModelProperty(value = "企标编号") - private String standardNo; + /**企标Id*/ + @ApiModelProperty(value = "企标Id") + private String standardId; /**授权人员*/ @ApiModelProperty(value = "授权人员") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthDeptMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthDeptMapper.xml index 2a77d176..c366d3ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthDeptMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthDeptMapper.xml @@ -11,7 +11,7 @@ - + @@ -19,6 +19,6 @@ id,create_by,create_time, update_by,update_time,org_code, - standard_no,authDept + standard_id,authDept diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml index 4d41c4f2..30804e61 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml @@ -11,7 +11,7 @@ - + @@ -19,6 +19,6 @@ id,create_by,create_time, update_by,update_time,org_code, - standard_no,auth_user,auth_expire_date + standard_id,auth_user,auth_expire_date diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java index 1278be28..a3b9a8eb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java @@ -27,11 +27,11 @@ public class EnterpriseStandardAuthDeptServiceImpl extends ServiceImpl esAuthDepts = new ArrayList<>(); - for (String standardNo : lawsStandardTempPermission.getStandardNoList()) { + for (String standardId : lawsStandardTempPermission.getStandardIdList()) { for (String deptId : lawsStandardTempPermission.getDeptIdList()) { EnterpriseStandardAuthDept enterpriseStandardAuthDept = new EnterpriseStandardAuthDept(); enterpriseStandardAuthDept.setAuthDept(deptId); - enterpriseStandardAuthDept.setStandardNo(standardNo); + enterpriseStandardAuthDept.setStandardId(standardId); if (lawsStandardTempPermission.getAuthDate() != null) { enterpriseStandardAuthDept.setAuthExpireDate(lawsStandardTempPermission.getAuthDate()); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index 8a0c17d9..cd6c467b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -26,11 +26,11 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl esAuthUsers = new ArrayList<>(); - for (String standardNo : lawsStandardTempPermission.getStandardNoList()) { + for (String standardId : lawsStandardTempPermission.getStandardIdList()) { for (String userId : lawsStandardTempPermission.getUserIdList()) { EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser(); enterpriseStandardAuthUser.setAuthUser(userId); - enterpriseStandardAuthUser.setStandardNo(standardNo); + enterpriseStandardAuthUser.setStandardId(standardId); if (lawsStandardTempPermission.getAuthDate() != null) { enterpriseStandardAuthUser.setAuthExpireDate(lawsStandardTempPermission.getAuthDate()); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java index 5d662b0d..2b3f6c30 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java @@ -9,6 +9,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -25,9 +26,9 @@ import java.util.stream.Collectors; public class LawsStandardTempPermission { @NotBlank - @ApiModelProperty(value = "标准标号") - String standardNos; - List standardNoList; + @ApiModelProperty(value = "标准id") + String standardIds; + List standardIdList; @ApiModelProperty(value = "部门Ids") String deptIds; @@ -41,12 +42,13 @@ public class LawsStandardTempPermission { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "授权到期日期") + @NotNull(message = "授权到期日期不能为空") Date authDate; - public void setStandardNos(String standardNos) { - this.standardNos = standardNos; - this.standardNoList = - Arrays.stream(standardNos.split(",")).map(String::trim).collect(Collectors.toList()); + public void setStandardIds(String standardIds) { + this.standardIds = standardIds; + this.standardIdList = + Arrays.stream(standardIds.split(",")).map(String::trim).collect(Collectors.toList()); } public void setDeptIds(String deptIds) {