From b1605f95f5657aa6ef34abc812d1fdb94ec38b61 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 16 Jul 2020 17:00:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E3=80=91=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85=E5=86=B5=E7=A4=BE=E7=BE=A4?=
 =?UTF-8?q?=E6=95=B0=E4=BC=98=E5=8C=96-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07?=
 =?UTF-8?q?-16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml  | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index b8b620ed8..4413d6347 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -234,11 +234,15 @@
     <select id="selectListCommunityCount" resultType="com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO">
         SELECT
         epgr.GRID_ID gridId,
-        COUNT( DISTINCT epgr.ID ) communityCount,
+        COUNT( DISTINCT epgrCount.ID ) communityCount,
         COUNT( DISTINCT ug.user_id ) communityMemberCount,
         COUNT( DISTINCT ut.ID ) communityTopicCount
         FROM
         esua_epdc_group.epdc_group epgr
+        left join esua_epdc_group.epdc_group epgrCount on epgr.id = epgrCount,id
+        <if test="startTime != null and endTime != null and endTime != ''">
+            AND DATE_FORMAT(epgrCount.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+        </if>
         LEFT JOIN esua_epdc_group.epdc_user_group ug ON epgr.id = ug.group_id AND ug.DEL_FLAG = '0'
         <if test="startTime != null and endTime != null and endTime != ''">
             AND DATE_FORMAT(ug.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
@@ -252,9 +256,7 @@
         <if test="gridIdList != null and gridIdList.size() > 0">
             AND epgr.GRID_ID in <include refid="foreachGridIdList"></include>
         </if>
-        <if test="startTime != null and endTime != null and endTime != ''">
-            AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
-        </if>
+
         GROUP BY epgr.GRID_ID
     </select>
 
@@ -986,13 +988,7 @@
         LEFT JOIN esua_epdc_group.epdc_group epgr ON find_in_set(t0.id, epgr.ALL_DEPT_IDS)
         AND epgr.DEL_FLAG = '0'
         AND (
-        epgr.STATE = '10'
-        <if test="operationStartTime != null and operationEndTime != null and operationEndTime != ''">
-            AND DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and DATE_FORMAT(epgr.CREATED_TIME,'%Y-%m-%d') &lt;=#{endTime}
-        </if>
+        epgr.STATE = '10' 
         OR epgr.STATE = '15'
         )
         <if test="deptIdList != null and deptIdList.size() > 0">

From a7a1048c37497e509497b7ade11f1b46b443a0cc Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 23 Jul 2020 16:23:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E5=AF=BC=E5=87=BA=E5=90=8E=E5=8F=B0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=97=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-07-23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/epidemic/excel/EpidemicExcel.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java
index 63fd7469c..efe6d600a 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/EpidemicExcel.java
@@ -31,11 +31,8 @@ import java.util.Date;
 @Data
 public class EpidemicExcel {
 
-    @Excel(name = "上报人")
-    private String reporter;
-
-    @Excel(name = "上报人电话")
-    private String mobile;
+    @Excel(name = "区域名称")
+    private String allDeptNames;
 
     @Excel(name = "上报地点")
     private String address;
@@ -43,11 +40,14 @@ public class EpidemicExcel {
     @Excel(name = "上报内容")
     private String content;
 
-    @Excel(name = "区域名称")
-    private String allDeptNames;
-
     @Excel(name = "提交时间", format = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
+    @Excel(name = "上报人")
+    private String reporter;
+
+    @Excel(name = "电话")
+    private String mobile;
+
 
 }
\ No newline at end of file

From 85218859f0f071009e69304747449c914c3f9c13 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 23 Jul 2020 17:06:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90pc=E7=AB=AF-=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E5=88=A4=E6=96=AD=E3=80=91?=
 =?UTF-8?q?=20=E9=AD=8F=E5=87=AF=202020-07-23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index c08f058cd..3577583b9 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -169,6 +169,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
     public void update(SysRoleDTO dto) {
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
+        checkDeptRoleAmount(dto.getTypeKey(), dto.getDeptIdList());
         //更新角色
         updateById(entity);