From 44bf847841d5f7d8896219a02f38d6574bb5840e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 May 2020 16:15:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 9b2cfcdbaf..6f4cdee72d 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -53,8 +53,7 @@ public class ProjectServiceImpl implements ProjectService { Result> resultList = govIssueFeignClient.getClosedProjectIssueList(closedProjectIssueListFormDTO); if (!resultList.success() || null == resultList.getData()) { logger.error(String.format("居民端党建园地-最新结案列表查询异常,调用%s服务,入参customerId%s,gridId%s", ServiceConstant.GOV_ISSUE_SERVER,formDTO.getCustomerId(),formDTO.getGridId())); -// throw new RenException(ProjectConstant.SELECT_ISSUE_EXCEPTION); - return new ArrayList<>(); + throw new RenException(ProjectConstant.SELECT_ISSUE_EXCEPTION+resultList.getInternalMsg()); } return resultList.getData(); } From ede4fe038134fa6376582a2ae2bc92097ec19cff Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 26 May 2020 16:25:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/OperUserServiceImpl.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java index e7cd4a7444..3d3e0c986e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java @@ -124,18 +124,11 @@ public class OperUserServiceImpl extends BaseServiceImpl Date: Tue, 26 May 2020 16:27:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E9=A6=96=E9=A1=B5=E6=9C=80=E6=96=B0=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IssueVoteStatisticalServiceImpl.java | 2 +- .../src/main/resources/mapper/IssueDao.xml | 11 +++++++++++ .../java/com/epmet/service/impl/UserServiceImpl.java | 9 ++++----- .../src/main/resources/mapper/UserRoleDao.xml | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 73b13fc557..71cd3fa895 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -253,7 +253,6 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet()); - List gridIds = issues.stream().map(IssueDTO::getGridId).collect(Collectors.toList()); CommonGridIdListFormDTO gridIdList = new CommonGridIdListFormDTO(); gridIdList.setGridIds(gridIds); @@ -429,6 +428,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl @@ -364,6 +365,16 @@ DEL_FLAG = '0' AND ISSUE_STATUS = #{issueStatus} + OR ( + ISSUE_STATUS = 'closed' + AND + TO_DAYS( NOW( ) ) - TO_DAYS( issue.CLOSED_TIME ) = 0 + ) + OR ( + ISSUE_STATUS = 'shift_project' + AND + TO_DAYS( NOW( ) ) - TO_DAYS( issue.SHIFTED_TIME ) = 0 + ) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 43fec48b74..2ca7b26fc4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -150,17 +150,16 @@ public class UserServiceImpl extends BaseServiceImpl implem MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg,MyResiUserInfoResultDTO.class); //registerFlag 是否已注册居民，true ,false result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()) ? true : false); - + result.setRegisterGridName(ModuleConstant.EMPTY_STR); if(StringUtils.isNotBlank(myselfMsg.getGridId())){ //registerGridName 首次注册的网格 CustomerGridFormDTO gridId = new CustomerGridFormDTO(); gridId.setGridId(myResiUserInfoFormDTO.getGridId()); Result gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId); - if(gridResult.success() && null != gridResult.getData()){ + if(gridResult.success() && null != gridResult.getData() && null != gridResult.getData().getGridName()){ result.setRegisterGridName(gridResult.getData().getGridName()); - }else{ - if(StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg()); - result.setRegisterGridName(ModuleConstant.EMPTY_STR); + }else { + if (StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg()); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 84539f5ea2..af3e8cbfbb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -64,7 +64,7 @@ AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' ) - + AND ur.GRID_ID = 'all'