Merge remote-tracking branch 'origin/dev'

epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@@ -73,7 +73,7 @@ public class GovWebServiceImpl implements GovWebService {
         form.setMobile(formDTO.getPhone());
         Result<GovWebOperLoginResultDTO> result = epmetUserFeignClient.getStaffIdAndPwd(form);
         if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
-            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
+            logger.warn("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
             throw new RenException(EpmetErrorCode.ERR10003.getCode());
         }
         GovWebOperLoginResultDTO resultDTO = result.getData();

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -167,7 +167,7 @@ public class SsoServiceImpl implements SsoService {
         //test end
 
         if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
-            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在,param:{}", JSON.toJSONString(form));
+            logger.warn("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在,param:{}", JSON.toJSONString(form));
             throw new RenException(EpmetErrorCode.ERR10003.getCode());
         }
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectGridDailyDao.xml

@@ -4,6 +4,7 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectGridDailyDao">
 
     <!--    下级网格的效率（解决率）列表 -->
+    <!-- 排序 +0 是把100排在99上边，不写 '+0'会出现 29 ，28 ，100 -->
     <select id="queryGridEfficiencyAnalysis" parameterType="map" resultType="com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO">
         SELECT
             m.CUSTOMER_ID AS customerId,
@@ -20,7 +21,7 @@
             m.DEL_FLAG = '0'
             AND a.AREA_CODE LIKE concat( #{areaCode}, '%')
             AND M.DATE_ID=#{dateId}
-            order by resolvedRatio desc
+            order by resolvedRatio+0 desc
     </select>
 
     <select id="selectLastDateId" resultType="java.lang.String">

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml

@@ -29,6 +29,7 @@
     </select>
 
     <!--    下级组织的效率（解决率）列表 -->
+    <!-- 排序 +0 是把100排在99上边，不写 '+0'会出现 29 ，28 ，100 -->
     <select id="queryEfficiencyAnalysis" parameterType="map" resultType="com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO">
         SELECT
             m.CUSTOMER_ID AS customerId,
@@ -51,6 +52,6 @@
                 order by t1.DATE_ID desc
                 limit 1
             )and m.CUSTOMER_ID=#{customerId}
-            order by resolvedRatio desc
+            order by resolvedRatio+0 desc
     </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml

@@ -35,6 +35,7 @@
 
 
     <!-- 查询公众参与各类总数 -->
+    <!-- 2021-05-26,按照要求，根据注册人数排序 -->
     <select id="selectPublicPartiTotalByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
        SELECT
             totalData.ORG_NAME AS NAME,
@@ -54,13 +55,7 @@
         WHERE
             totalData.DEL_FLAG = '0'
             AND agency.PARENT_AREA_CODE=#{areaCode}
-            ORDER BY
-            (totalData.REG_USER_TOTAL + totalData.JOIN_USER_TOTAL + totalData.TOPIC_TOTAL + totalData.ISSUE_TOTAL + totalData.PROJECT_TOTAL) DESC,
-                                totalData.REG_USER_TOTAL desc,
-                                totalData.JOIN_USER_TOTAL desc,
-                                totalData.TOPIC_TOTAL desc,
-                                totalData.ISSUE_TOTAL desc,
-                                totalData.PROJECT_TOTAL desc
+            ORDER BY totalData.REG_USER_TOTAL desc
     </select>
 
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -598,22 +598,35 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	public Result agreeApplyGroup(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
 		//1、更新组的状态
 		ResiGroupDTO resiGroupDTO = this.get(agreeApplyGroupFormDTO.getGroupId());
+		if (null == resiGroupDTO) {
+			throw new RenException("小组信息不存在");
+		}
+		if (GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
+			logger.warn("当前小组已审核通过,groupId=" + agreeApplyGroupFormDTO.getGroupId());
+			return new Result();
+		}
 		resiGroupDTO.setState(GroupStateConstant.GROUP_APPROVED);
 		this.update(resiGroupDTO);
 		//2、更新组的申请记录改为已通过
 		ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(agreeApplyGroupFormDTO.getGroupId());
-		resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
-		resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
-		resiGroupOperationService.update(resiGroupOperation);
+		if (null != resiGroupOperation) {
+			resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
+			resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
+			resiGroupOperationService.update(resiGroupOperation);
+		}
 		//3、将群主在群成员的状态改为已通过
 		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectLeaderMember(agreeApplyGroupFormDTO.getGroupId());
-		resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
-		resiGroupMemberService.update(resiGroupMemberDTO);
+		if (null != resiGroupMemberDTO) {
+			resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
+			resiGroupMemberService.update(resiGroupMemberDTO);
+		}
 		//4、更新群主的出入群记录改为已通过
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationDao.selectLeaderRecord(agreeApplyGroupFormDTO.getGroupId());
-		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
-		groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
-		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		if (null != groupMemeberOperationDTO) {
+			groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
+			groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
+			groupMemeberOperationService.update(groupMemeberOperationDTO);
+		}
 		//4-1.2020.11.17 sun  添加小组审核通过后生成小组的二维码图片逻辑 start
 		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
 			@Override