Merge branch 'hotfix/pcManageBug' of http://121.42.41.42:7070/r/esua-epdc-cloud into hotfix/pcManageBug

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

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">

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;
+
 
 }