From 20ce4d55484d7d35289786124f0a842564499191 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 22 Jan 2021 15:06:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BE=A4=E9=93=BE=E6=8E=A5=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=99=8D=E7=BA=A7warn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GroupInvitationServiceImpl.java       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index e577907d89..1a063a83e4 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -328,11 +328,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);
 		//Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false；
 		if (null == groupInvitationDTO) {
-			logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
+			logger.warn(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
 			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
 		if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) {
-			logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
+			logger.warn(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
 			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
 		/*ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId());
@@ -369,7 +369,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		//3、进入小组所在的网格
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
 		if(null==resiGroupDTO){
-			logger.error(String.format("用户同意邀请进组，查询组信息失败。入参：userId【%s】、invitationId【%s】、groupId【%s】。",formDTO.getUserId(),formDTO.getInvitationId(),groupInvitationDTO.getResiGroupId()));
+			logger.warn(String.format("用户同意邀请进组，查询组信息失败。入参：userId【%s】、invitationId【%s】、groupId【%s】。",formDTO.getUserId(),formDTO.getInvitationId(),groupInvitationDTO.getResiGroupId()));
 			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
 		UserEnterGridFormDTO userEnterGridFormDTO=new UserEnterGridFormDTO();
@@ -377,11 +377,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userEnterGridFormDTO.setGridId(resiGroupDTO.getGridId());
 		Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
 		if (!result.success() || null == result.getData()) {
-			logger.error(String.format("用户同意邀请进组,进入网格失败。入参：userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】",
+			logger.warn(String.format("用户同意邀请进组,进入网格失败。入参：userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】",
 					formDTO.getUserId(), formDTO.getInvitationId(),
 					groupInvitationDTO.getResiGroupId()),
 					resiGroupDTO.getCustomerId(), resiGroupDTO.getGridId());
-			logger.error(String.format("用户同意邀请进组,进入网格失败。当前接口返回8000,调用enterGrid接口返回", result.toString()));
+			logger.warn(String.format("用户同意邀请进组,进入网格失败。当前接口返回8000,调用enterGrid接口返回", result.toString()));
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
 		}
 		//4、校验是否已经注册居民
@@ -463,7 +463,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		//3、进入小组所在的网格
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
 		if(null==resiGroupDTO){
-			logger.error(String.format("用户同意邀请进组，查询组信息失败。入参：userId【%s】、invitationId【%s】、groupId【%s】。",formDTO.getUserId(),formDTO.getInvitationId(),groupInvitationDTO.getResiGroupId()));
+			logger.warn(String.format("用户同意邀请进组，查询组信息失败。入参：userId【%s】、invitationId【%s】、groupId【%s】。",formDTO.getUserId(),formDTO.getInvitationId(),groupInvitationDTO.getResiGroupId()));
 			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
 		UserEnterGridFormDTO userEnterGridFormDTO=new UserEnterGridFormDTO();
@@ -471,11 +471,11 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userEnterGridFormDTO.setGridId(resiGroupDTO.getGridId());
 		Result<UserInfoOnEnterGridResultDTO> result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO);
 		if (!result.success() || null == result.getData()) {
-			logger.error(String.format("用户同意邀请进组,进入网格失败。入参：userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】",
+			logger.warn(String.format("用户同意邀请进组,进入网格失败。入参：userId【%s】、invitationId【%s】、groupId【%s】、customerId【%s】、gridId【%s】",
 					formDTO.getUserId(), formDTO.getInvitationId(),
 					groupInvitationDTO.getResiGroupId()),
 					resiGroupDTO.getCustomerId(), resiGroupDTO.getGridId());
-			logger.error(String.format("用户同意邀请进组,进入网格失败。当前接口返回8000,调用enterGrid接口返回", result.toString()));
+			logger.warn(String.format("用户同意邀请进组,进入网格失败。当前接口返回8000,调用enterGrid接口返回", result.toString()));
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
 		}
 		//4、校验是否已经注册居民
@@ -629,7 +629,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		if (result.success()) {
 			logger.info("通知群主有新成员入群成功");
 		} else {
-			logger.error("通知群主有新成员入群失败" + result.getMsg());
+			logger.warn("通知群主有新成员入群失败" + result.getMsg());
 		}
 		return result;
 	}

From 547dced5b5f98b51ab460935e7653eb51009ff7b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 25 Jan 2021 14:19:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=88=E9=94=8B=E6=A8=A1=E8=8C=83bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenPioneerDataDao.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
index 505ca018a8..c1a5570113 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
@@ -7,17 +7,17 @@
     <select id="selectFineExample" resultType="com.epmet.evaluationindex.screen.dto.result.FineExampleResultDTO">
         SELECT
             issue_total AS issueTotal,
-            issue_ratio AS issueRatioA,
+            IFNULL(issue_ratio,0) AS issueRatioA,
             topic_total AS topicTotal,
-            topic_ratio AS topicRatioA,
+            IFNULL(topic_ratio,0) AS topicRatioA,
             shift_project_total AS shiftProjectTotal,
-            shift_project_Ratio AS shiftProjectRatioA,
+            IFNULL(shift_project_Ratio,0) AS shiftProjectRatioA,
             resolved_project_total AS resolvedProjectTotal,
-            resolved_project_ratio AS resolvedProjectRatioA,
+            IFNULL(resolved_project_ratio,0) AS resolvedProjectRatioA,
             publish_issue_total AS publishIssueTotal,
-            publish_issue_ratio AS publishIssueRatioA,
+            IFNULL(publish_issue_ratio,0) AS publishIssueRatioA,
             PLAT_ISSUE_TOTAL AS platIssueTotal,
-            PLAT_JOIN_PARTY_RATIO AS platJoinPartyRatio
+            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio
         FROM
             screen_pioneer_data
         WHERE