From 6e46d0891e0af6844bb2360c4930807417df4142 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Jul 2021 09:27:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 3 ++- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 80885587be..43c5468cc3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -190,7 +190,8 @@ public enum EpmetErrorCode { NOTICE_BE_OVERDUE(8915,"通知已过期不允许再次变更"), SAME_RULE_NAME(8916,"该积分事件已存在，请重新调整保存"), - UP_LIMIT_POINT(8917,"积分上限需为单位积分倍数，请重新调整保存"); + UP_LIMIT_POINT(8917,"积分上限需为单位积分倍数，请重新调整保存"), + BADGE_CHECK(8918,""); private int code; 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 a2b08568e7..57559594b3 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 @@ -247,6 +247,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { @Override @Transactional(rollbackFor = Exception.class) public Result authBadgeRecord(CertificationAddFormDTO certificationAddFormDTO) { + // 校验这个徽章此人有没有 Integer recordCount = userBadgeCertificateRecordDao.selectIsExist(certificationAddFormDTO.getBadgeId(), certificationAddFormDTO.getUserId()); if (recordCount>NumConstant.ZERO){ throw new RenException("不允许重复提交审核"); @@ -293,10 +294,12 @@ public class UserBadgeServiceImpl implements UserBadgeService { } Set requiredColumns = authFieldResultDTOS.stream() .filter(o -> NumConstant.ONE_STR.equals(o.getIsRequired())) - .map(AuthFieldResultDTO::getEnName).collect(Collectors.toSet()); + .map(AuthFieldResultDTO::getCnName).collect(Collectors.toSet()); List missColumns = ValidatorUtils.hasAllRequired(JSON.toJSONString(certificationAddFormDTO), requiredColumns); if (!CollectionUtils.isEmpty(missColumns)) { - throw new RenException(JSON.toJSONString(missColumns).concat("不能为空")); + EpmetErrorCode.BADGE_CHECK.setMsg(JSON.toJSONString(missColumns).concat("不能为空")); + throw new RenException(EpmetErrorCode.BADGE_CHECK.getCode()); +// throw new RenException(JSON.toJSONString(missColumns).concat("不能为空")); } } @@ -360,6 +363,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { */ @Override public List authField(AuthFieldFormDTO authFieldFormDTO) { + // 查询徽章要显示的认证信息字段 List authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO); if (CollectionUtils.isEmpty(authFieldResultDTOS)){ authFieldFormDTO.setCustomerId(BadgeConstant.DEFAULT_CUSTOMER); From e9f7eb060942f7c2e6d85fa45ac4dd32ac1073b0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Jul 2021 09:48:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/CertificationDetailResultDTO.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 95670ba7e8..63783adc2c 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 @@ -62,4 +62,17 @@ public class CertificationDetailResultDTO implements Serializable { * 审核记录ID */ private String recordId; + + public CertificationDetailResultDTO() { + this.surname = ""; + this.name = ""; + this.idcard = ""; + this.isCertificated = ""; + this.mobile = ""; + this.certificationImg = ""; + this.remark = ""; + this.authResult = ""; + this.authReason = ""; + this.recordId = ""; + } } From 85b7994e587960bc09d99f804a53fe21181d9cae Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Jul 2021 10:07:54 +0800 Subject: [PATCH 3/4] . --- .../main/java/com/epmet/service/impl/UserBadgeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 57559594b3..0545a62c66 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 @@ -294,7 +294,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { } Set requiredColumns = authFieldResultDTOS.stream() .filter(o -> NumConstant.ONE_STR.equals(o.getIsRequired())) - .map(AuthFieldResultDTO::getCnName).collect(Collectors.toSet()); + .map(AuthFieldResultDTO::getEnName).collect(Collectors.toSet()); List missColumns = ValidatorUtils.hasAllRequired(JSON.toJSONString(certificationAddFormDTO), requiredColumns); if (!CollectionUtils.isEmpty(missColumns)) { EpmetErrorCode.BADGE_CHECK.setMsg(JSON.toJSONString(missColumns).concat("不能为空")); From 8fbbfb74337c0d8595efdc82300bbed116ab46a4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 13 Jul 2021 13:38:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?emm=20=EF=BC=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 0545a62c66..0716978c1c 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 @@ -297,9 +297,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { .map(AuthFieldResultDTO::getEnName).collect(Collectors.toSet()); List missColumns = ValidatorUtils.hasAllRequired(JSON.toJSONString(certificationAddFormDTO), requiredColumns); if (!CollectionUtils.isEmpty(missColumns)) { - EpmetErrorCode.BADGE_CHECK.setMsg(JSON.toJSONString(missColumns).concat("不能为空")); - throw new RenException(EpmetErrorCode.BADGE_CHECK.getCode()); -// throw new RenException(JSON.toJSONString(missColumns).concat("不能为空")); + /*EpmetErrorCode.BADGE_CHECK.setMsg(JSON.toJSONString(missColumns).concat("不能为空")); + throw new RenException(EpmetErrorCode.BADGE_CHECK.getCode());*/ + throw new RenException(JSON.toJSONString(missColumns).concat("不能为空")); } }