From 77211dd18d40acdd399feb105cea2965575984bd Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 26 May 2020 16:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B1=85=E6=B0=91=E7=AB=AF?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=80=E6=96=B0=E8=AE=AE=E9=A2=98=E6=8E=A5?=
 =?UTF-8?q?=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<IssueVoteSt
         }
         Set<String> ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet());
 
-
         List<String> 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<IssueVoteSt
         }
         toUpd.setVotableCount(NumConstant.ZERO);
 
+        IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueId);
     }
 
     /**
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index 8f030f2237..cb21c4abe8 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -350,6 +350,7 @@
         WHERE del_flag = '0'
         AND customer_id = #{customerId}
         AND grid_id = #{gridId}
+        AND issue_status = 'voting'
         ORDER BY created_time DESC
         LIMIT #{pageSize}
     </select>
@@ -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
+        )
     </select>
 
     <!-- 校验话题是否已转议题 -->
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<UserDao, UserEntity> 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<CustomerGridDTO> 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 @@
             <if test='null != gridId and "" != gridId'>
                 AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
             </if>
-            <if test='gridId == null or gridId = ""'>
+            <if test='gridId == null or gridId == ""'>
                 AND ur.GRID_ID = 'all'
             </if>
         </where>