diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java index a4fc503431..e0fef69bbb 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/form/LogOperationListFormDTO.java @@ -27,7 +27,12 @@ public class LogOperationListFormDTO { */ private String endTime; /** - * 默认传data_tm + * 产品原本前端默认传data_tm + * 03.01烟台需求，列表展示全部 + * 项目流转：project_changed + * 登录：auth + * 积分：point + * 查看脱敏信息：data_tm */ private String category; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql deleted file mode 100644 index bb41f4af36..0000000000 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql +++ /dev/null @@ -1,18 +0,0 @@ -alter table tag_customer add COLUMN SHOW_FLAG TINYINT(1) DEFAULT 1 comment '1：展示；0：隐藏;0302因烟台需求增加此列默认1' after USE_COUNT; - -CREATE TABLE `tag_scope` ( - `ID` varchar(64) NOT NULL COMMENT '主键（0302因烟台需求增加此表）', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID（0302因烟台需求增加此表）', - `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID', - `AGENCY_ID` varchar(64) NOT NULL COMMENT '应用范围，这里只能是社区id', - `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'agency_id全路径，包含自身', - `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签应用范围表'; - - diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java new file mode 100644 index 0000000000..804f22ee8b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeAuditPageFormDTO.java @@ -0,0 +1,58 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2023/3/6 9:58 + */ +@Data +public class BadgeAuditPageFormDTO implements Serializable { + private static final long serialVersionUID = -6908967598027076330L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + private String customerId; + /** + * 页码 + */ + @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) + private Integer pageNo; + /** + * 每页显示数量 + */ + @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) + private Integer pageSize; + /** + * 当前用户所属的组织id + */ + @NotBlank(message = "agencyId不能为空", groups = AddUserInternalGroup.class) + private String agencyId; + + /** + * 网格Id + */ + private String gridId; + /** + * 徽章id + */ + private String badgeId; + /** + * 审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中 + */ + private String auditStatus; + + +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java index 7ae47fdbca..2ea48afe64 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java @@ -37,7 +37,7 @@ public class BadgeAuditRecordResultDTO implements Serializable { */ private Long createTime; /** - * 用户名 + * 审核状态 approved:审核通过，rejected:审核驳回;auditing:审核中 */ private String auditStatus; @@ -50,4 +50,16 @@ public class BadgeAuditRecordResultDTO implements Serializable { * 审核记录ID */ private String recordId; + + /** + * pc端徽章审核-分页列表赋值 + * 03.07:烟台需求pc端增加徽章审核 + */ + private String gridId; + /** + * pc端徽章审核-分页列表赋值 + * 03.07:烟台需求pc端增加徽章审核 + * 网格名称：社区-网格 + */ + private String gridName; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java index 8374a6497e..015f0d9422 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeListResultDTO.java @@ -32,4 +32,5 @@ public class BadgeListResultDTO { * 固有徽章类型 党员徽章：party;无：none */ private String type; + private String customerId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java index 63783adc2c..0cab1b7039 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java @@ -63,6 +63,8 @@ public class CertificationDetailResultDTO implements Serializable { */ private String recordId; + private String gridId; + private String gridName; public CertificationDetailResultDTO() { this.surname = ""; this.name = ""; @@ -74,5 +76,7 @@ public class CertificationDetailResultDTO implements Serializable { this.authResult = ""; this.authReason = ""; this.recordId = ""; + this.gridId=""; + this.gridName=""; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 7f58178ffe..151302844d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.enums.RequirePermissionEnum; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -140,6 +141,20 @@ public class BadgeController { return new Result>().ok(result); } + /** + * pc端徽章审核-分页列表 + * + * @param formDTO + * @return + */ + @PostMapping("audit-page-list") + public Result> auditPageList(@LoginUser TokenDto tokenDto,@RequestBody BadgeAuditPageFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(formDTO, BadgeAuditPageFormDTO.AddUserInternalGroup.class, BadgeAuditPageFormDTO.AddUserShowGroup.class); + return new Result>().ok(badgeService.auditPageList(formDTO)); + } + + /** * 审核 * @author zhaoqifeng @@ -232,4 +247,12 @@ public class BadgeController { return new Result().ok(badgeService.deleteBadgeCertificateAuditing(customerId,gridId)); } + /** + * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件 + * @return + */ + @PostMapping("badge-options") + public Result> queryBadgeOptions(@LoginUser TokenDto tokenDto){ + return new Result>().ok(badgeService.queryBadgeOptions(tokenDto.getCustomerId())); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index 113ed28dee..528c00c45a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -213,4 +213,19 @@ public interface BadgeDao extends BaseDao { */ Integer badgeAuditReset(@Param("gridId") String gridId); + /** + * pc端徽章审核-分页列表 + * + * @param customerId + * @param agencyId + * @param gridId + * @param badgeId + * @param auditStatus + * @return + */ + List auditPageList(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("badgeId") String badgeId, + @Param("auditStatus") String auditStatus); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java index a032c42fea..47ca624036 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserBadgeCertificateRecordEntity.java @@ -47,6 +47,7 @@ public class UserBadgeCertificateRecordEntity extends BaseEpmetEntity { */ private String gridId; + /** * 用户ID */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index 379d3c8fad..88cfbfee15 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -215,4 +215,18 @@ public interface BadgeService extends BaseService { * @return */ Integer deleteBadgeCertificateAuditing(String customerId, String gridId); + + /** + * pc端徽章审核-分页列表 + * @param formDTO + * @return + */ + PageData auditPageList(BadgeAuditPageFormDTO formDTO); + + /** + * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件 + * @param customerId + * @return + */ + List queryBadgeOptions(String customerId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 39359b29ea..e6721412b8 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -30,6 +30,8 @@ import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -49,6 +51,8 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.MessageFeignClient; import com.epmet.redis.UserBadgeRedis; import com.epmet.service.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -516,4 +520,40 @@ public class BadgeServiceImpl extends BaseServiceImpl imp public Integer deleteBadgeCertificateAuditing(String customerId, String gridId) { return userBadgeCertificateRecordService.deleteBadgeCertificateAuditing(customerId,gridId); } + + /** + * pc端徽章审核-分页列表 + * + * @param formDTO + * @return + */ + @Override + public PageData auditPageList(BadgeAuditPageFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.auditPageList(formDTO.getCustomerId(), + formDTO.getAgencyId(), + formDTO.getGridId(), + formDTO.getBadgeId(), + formDTO.getAuditStatus()); + list.forEach(dto -> { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfoCache) { + dto.setGridName(gridInfoCache.getGridNamePath()); + } + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 查询当前客户下，所有的徽章，用于pc徽章审核查询条件 + * + * @param customerId + * @return + */ + @Override + public List queryBadgeOptions(String customerId) { + List list=baseDao.selectList(customerId); + return list; + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 009870cb44..5d27aaf3ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -6,6 +6,8 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -413,6 +415,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { resiResult.setIdcard(userInfo.getIdNum()); } } + GridInfoCache gridInfoCache= CustomerOrgRedis.getGridInfo(resiResult.getGridId()); + if(null!=gridInfoCache){ + resiResult.setGridName(gridInfoCache.getGridNamePath()); + } return resiResult; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 275babd61f..2d9d49fd74 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -67,7 +67,8 @@ BADGE_NAME, BADGE_ICON, BADGE_STATUS, - FIXATION_BADGE_TYPE AS "type" + FIXATION_BADGE_TYPE AS "type", + CUSTOMER_ID as customerId FROM ( SELECT * FROM badge @@ -340,4 +341,59 @@ AND AUDIT_STATUS = 'auditing' AND GRID_ID = #{gridId} + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 95b77d51a7..e95397c3bf 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -115,7 +115,8 @@ AUDIT_STATUS, AUDIT_STATUS AS authResult, AUDIT_REMARK AS authReason, - ID AS recordId + ID AS recordId, + GRID_ID as gridId FROM user_badge_certificate_record WHERE