Merge branch 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project

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);
     }
 
     /**

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>
 
     <!-- 校验话题是否已转议题 -->

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<List<LatestListResultDTO>> 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();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java

@@ -124,18 +124,11 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
     public void update(OperUserDTO dto) {
         OperUserEntity entity = ConvertUtils.sourceToTarget(dto, OperUserEntity.class);
 
-        //密码加密
-        if(StringUtils.isBlank(dto.getPassword())){
-            entity.setPassword(null);
-        }else{
-            String password = PasswordUtils.encode(entity.getPassword());
-            entity.setPassword(password);
-        }
-
+        entity.setPassword(null);
         updateById(entity);
 
         //更新角色用户关系
-        operRoleUserFeignClient.saveOrUpdate(entity.getId(),dto.getRoleIdList());
+        operRoleUserFeignClient.saveOrUpdate(entity.getUserId(),dto.getRoleIdList());
     }
 
     @Override

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());
                 }
             }
 

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>