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

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java

@@ -41,7 +41,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
 
-    private static final long serialVersionUID = -319379699436244053L;
+    private static final long serialVersionUID = 6519576943595915555L;
 
     /**
      * id
@@ -76,6 +76,11 @@ public class AppMenuDTO extends TreeNode<SysMenuDTO> implements Serializable {
      */
     private String permissions;
 
+    /**
+     * 样式名称
+     */
+    private String className;
+
     /**
      * 排序
      */

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuTemplateDTO.java

@@ -31,38 +31,27 @@ import lombok.Data;
 @Data
 public class AppMenuTemplateDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1917600597335070111L;
 
     /**
      * 主键
      */
 	private String id;
 
-    /**
-     * 是否渐变色（0否1是）
-     */
-	private String gradationFlag;
-
     /**
      * 背景颜色（渐变色为0时使用）
      */
 	private String backgroundColor;
 
     /**
-     * 开始色（渐变色为1时使用）
+     * CSS类名
-     */
-	private String startColor;
-
-    /**
-     * 终止色（渐变色为1时使用）
      */
-	private String endColor;
+	private String className;
 
     /**
-     * 标签颜色
+     * 备用CSS类名
      */
-	private String lableColor;
+	private String spareClassName;
-
 
     /**
      * 模板编码(tem-1,tem-2,tem-3)
@@ -74,6 +63,11 @@ public class AppMenuTemplateDTO implements Serializable {
      */
 	private String templateName;
 
+    /**
+     * 模块列数
+     */
+	private Integer columnAmount;
+
     /**
      * 乐观锁
      */

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppChildNavResultDTO.java

@@ -11,25 +11,30 @@ import java.io.Serializable;
  */
 @Data
 public class EpdcAppChildNavResultDTO implements Serializable {
-	private static final long serialVersionUID = 1883432894888014315L;
+    private static final long serialVersionUID = 1883432894888014315L;
-
+
-	/**
+    /**
-	 * 菜单名
+     * 菜单名
-	 */
+     */
-	private String lable;
+    private String label;
-
+
-	/**
+    /**
-	 * 菜单编码
+     * 菜单编码
-	 */
+     */
-	private String navCode;
+    private String navCode;
-
+
-	/**
+    /**
-	 * 备注
+     * 备注
-	 */
+     */
-	private String remark;
+    private String remark;
-
+
-	/**
+    /**
-	 * 菜单图标
+     * 菜单图标
-	 */
+     */
-	private String icon;
+    private String icon;
+
+    /**
+     * 样式名称
+     */
+    private String className;
 }

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppIndexPanelResultDTO.java

@@ -16,7 +16,7 @@ public class EpdcAppIndexPanelResultDTO implements Serializable {
 	/**
 	 * 主菜单名
 	 */
-	private String mainLable;
+	private String mainLabel;
 
 	/**
 	 * 子菜单模板信息

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppTemplateInfoResultDTO.java

@@ -13,33 +13,29 @@ import java.io.Serializable;
 public class EpdcAppTemplateInfoResultDTO implements Serializable {
 	private static final long serialVersionUID = -5608333958115132353L;
 
-	/**
-	 * 是否渐变色（0否，1是）
-	 */
-	private String gradationFlag;
 
 	/**
 	 * 背景色（渐变色为0时使用）
 	 */
 	private String backgroundColor;
 
-	/**
+    /**
-	 * 开始色（渐变色为1时使用）
+     * CSS类名
-	 */
+     */
-	private String startColor;
+    private String className;
-
-	/**
-	 * 终止色（渐变色为1时使用）
-	 */
-	private String endColor;
 
-	/**
+    /**
-	 * 标签颜色
+     * 备用CSS类名
-	 */
+     */
-	private String lableColor;
+    private String spareClassName;
 
 	/**
 	 * 模板编码(tmp-1,tmp-2,tmp-3)
 	 */
 	private String templateCode;
+
+    /**
+     * 模块列数
+     */
+    private Integer columnAmount;
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AppMenuTemplateController.java

@@ -18,7 +18,6 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -60,7 +60,7 @@ public class SysDeptController {
     /***
      *  通过编码得到党委编码
      * @param partyCode
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map   <   java.lang.String   ,   java.lang.String>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map < java.lang.String, java.lang.String>>
      * @author qushutong
      * @date 2019/9/20 19:56
      */
@@ -135,7 +135,7 @@ public class SysDeptController {
      * 通过街道ID获取项目可流转部门
      *
      * @Params: [deptId]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.SysDeptDTO>>
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.SysDeptDTO>>
      * @Author: liuchuang
      * @Date: 2019/9/16 17:00
      */
@@ -145,5 +145,29 @@ public class SysDeptController {
         return new Result<List<SysDeptDTO>>().ok(data);
     }
 
+    /**
+     * 根据部门id，获取所有上级部门id，英文逗号隔开拼接字符串
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author work@yujt.net.cn
+     * @date 2019/11/27 15:07
+     */
+    @GetMapping("getParentDeptIds/{deptId}")
+    public Result<String> getParentDeptIds(@PathVariable("deptId") Long deptId) {
+        return sysDeptService.getParentDeptIds(deptId);
+    }
 
+    /**
+     * 根据部门id，获取部门所在四级机构的所有机构名称
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/27 15:08
+     */
+    @GetMapping("getCompleteDeptList/{deptId}")
+    public Result<List<String>> getCompleteDeptList(@PathVariable("deptId") Long deptId) {
+        return sysDeptService.getCompleteDeptList(deptId);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java

@@ -72,6 +72,11 @@ public class AppMenuEntity extends BaseEntity {
      */
     private String permissions;
 
+    /**
+     * 样式名称
+     */
+    private String className;
+
     /**
      * 排序
      */

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuTemplateEntity.java

@@ -36,12 +36,8 @@ import java.util.Date;
 @TableName("sys_app_menu_template")
 public class AppMenuTemplateEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 3771232002180783503L;
 
-    /**
-     * 是否渐变色（0否1是）
-     */
-	private String gradationFlag;
 
     /**
      * 背景颜色（渐变色为0时使用）
@@ -49,19 +45,14 @@ public class AppMenuTemplateEntity extends BaseEpdcEntity {
 	private String backgroundColor;
 
     /**
-     * 开始色（渐变色为1时使用）
+     * CSS类名
-     */
-	private String startColor;
-
-    /**
-     * 终止色（渐变色为1时使用）
      */
-	private String endColor;
+    private String className;
 
     /**
-     * 标签颜色
+     * 备用CSS类名
      */
-	private String lableColor;
+    private String spareClassName;
 
     /**
      * 模板编码(tem-1,tem-2,tem-3)
@@ -73,4 +64,9 @@ public class AppMenuTemplateEntity extends BaseEpdcEntity {
      */
 	private String templateName;
 
+    /**
+     * 模块列数
+     */
+    private Integer columnAmount;
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -112,4 +112,24 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @date 2019/10/24 15:26
      */
     List<GridForLeaderRegisterDTO> selectListGridForLeader(List<String> gridIdList);
+
+    /**
+     * 根据部门id，获取所有上级部门id，英文逗号隔开拼接字符串
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author work@yujt.net.cn
+     * @date 2019/11/27 15:09
+     */
+    Result<String> getParentDeptIds(Long deptId);
+
+    /**
+     * 根据部门id，获取部门所在四级机构的所有机构名称
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.String>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/27 15:09
+     */
+    Result<List<String>> getCompleteDeptList(Long deptId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.feign.GroupFeignClient;
 import com.elink.esua.epdc.service.SysDeptService;
 import com.elink.esua.epdc.service.SysUserService;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -253,8 +254,23 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("party_code", dto.getPartyCode());
         Long id = dto.getId();
-        wrapper.ne(id!=null, "id", dto.getId());
+        wrapper.ne(id != null, "id", dto.getId());
         return baseDao.selectCount(wrapper);
     }
 
+    @Override
+    public Result<String> getParentDeptIds(Long deptId) {
+        return new Result<String>().ok(getPidList(deptId));
+    }
+
+    @Override
+    public Result<List<String>> getCompleteDeptList(Long deptId) {
+        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(deptId);
+        List<String> list = Lists.newArrayList();
+        list.add(completeDept.getDistrict());
+        list.add(completeDept.getStreet());
+        list.add(completeDept.getCommunity());
+        list.add(completeDept.getGrid());
+        return new Result().ok(list);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -221,6 +221,16 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     public Result modifyOpenIdByUsername(SysUserOpenIdFormDTO sysUserOpenIdFormDto) {
+        // 查询当前openId是否绑定过账户
+        SysUserDTO userDto = this.getSysUserInfoByOpenId(sysUserOpenIdFormDto.getOpenId());
+        if (null != userDto) {
+            // 解绑旧帐户
+            SysUserEntity entity = new SysUserEntity();
+            entity.setId(userDto.getId());
+            entity.setOpenId("");
+            baseDao.updateById(entity);
+        }
+        // 绑定新账户
         baseDao.updateOpenIdByUsername(sysUserOpenIdFormDto);
 
         return new Result();

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuDao.xml

@@ -69,34 +69,34 @@
     </select>
 
     <resultMap id="EpdcIndexPanelResultDTOMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO">
-        <id column="mainLable" property="mainLable"/>
+        <id column="mainLabel" property="mainLabel"/>
         <association property="templateInfo" javaType="com.elink.esua.epdc.dto.epdc.result.EpdcAppTemplateInfoResultDTO" >
-            <result column="gradationFlag" property="gradationFlag"/>
+            <result column="columnAmount" property="columnAmount"/>
             <result column="backgroundColor" property="backgroundColor"/>
-            <result column="startColor" property="startColor"/>
+            <result column="className" property="className"/>
-            <result column="endColor" property="endColor"/>
+            <result column="spareClassName" property="spareClassName"/>
-            <result column="lableColor" property="lableColor"/>
             <result column="templateCode" property="templateCode"/>
         </association>
         <collection property="childNav" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO">
-            <result column="lable" property="lable"/>
+            <result column="label" property="label"/>
             <result column="navCode" property="navCode"/>
             <result column="remark" property="remark"/>
             <result column="icon" property="icon"/>
+            <result column="className" property="className"/>
         </collection>
     </resultMap>
 
     <select id="indexPanelByMobile" resultMap="EpdcIndexPanelResultDTOMap">
         SELECT
-            lp.field_value AS mainLable,
+            lp.field_value AS mainLabel,
-            t.GRADATION_FLAG AS gradationFlag,
+            t.COLUMN_AMOUNT AS columnAmount,
             t.BACKGROUND_COLOR AS backgroundColor,
-            t.START_COLOR AS startColor,
+            t.CLASS_NAME AS className,
-            t.END_COLOR AS endColor,
+            t.SPARE_CLASS_NAME AS spareClassName,
-            t.LABLE_COLOR AS lableColor,
             t.TEMPLATE_CODE AS templateCode,
-            lc.field_value AS lable,
+            lc.field_value AS label,
             mc.menu_code AS navCode,
+            mc.class_name AS className,
             mc.remark,
             mc.icon
         FROM

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java

@@ -119,7 +119,7 @@ public class AuthController {
         ValidatorUtils.validateEntity(workUserLoginDto);
         Result<WorkUserAuthorizationDTO> result = authService.workLogin(workUserLoginDto.getUsername(), workUserLoginDto.getPassword());
         if (result.success()) {
-            // 更新用户openId
+            // 解绑上一次登录账户并绑定当前账户
             SysUserOpenIdFormDTO sysUserOpenIdFormDto = ConvertUtils.sourceToTarget(workUserLoginDto, SysUserOpenIdFormDTO.class);
             authService.modifyOpenId(sysUserOpenIdFormDto);
         }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@@ -16,6 +16,7 @@ import com.elink.esua.epdc.feign.OssFeignClient;
 import com.elink.esua.epdc.service.IssueService;
 import me.chanjar.weixin.mp.api.WxMpMaterialService;
 import me.chanjar.weixin.mp.api.WxMpService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -62,12 +63,24 @@ public class IssueServiceImpl implements IssueService {
         // 获取该网格所有上级机构
         Result<CompleteDeptDTO> deptDTOResult = adminFeignClient.getCompleteDept(userDetail.getGridId());
         CompleteDeptDTO deptDTO = deptDTOResult.getData();
-        formDto.setArea(deptDTO.getDistrict());
+//        formDto.setArea(deptDTO.getDistrict());
-        formDto.setAreaId(deptDTO.getDistrictId());
+//        formDto.setAreaId(deptDTO.getDistrictId());
-        formDto.setStreet(deptDTO.getStreet());
+//        formDto.setStreet(deptDTO.getStreet());
-        formDto.setStreetId(deptDTO.getStreetId());
+//        formDto.setStreetId(deptDTO.getStreetId());
-        formDto.setCommunity(deptDTO.getCommunity());
+//        formDto.setCommunity(deptDTO.getCommunity());
-        formDto.setCommunityId(deptDTO.getCommunityId());
+//        formDto.setCommunityId(deptDTO.getCommunityId());
+        // 父所有部门（包含街道、社区）
+        String deptNames = (StringUtils.isNotEmpty(deptDTO.getStreet()) ? deptDTO.getStreet() : "");
+        deptNames += (StringUtils.isNotEmpty(deptDTO.getCommunity()) ? ","+deptDTO.getCommunity() : "");
+        String deptIds = (deptDTO.getStreetId()!=null && deptDTO.getStreetId()!= 0 ? deptDTO.getStreetId().toString() : "");
+        deptIds += (deptDTO.getCommunityId()!=null && deptDTO.getCommunityId()!= 0 ? ","+deptDTO.getCommunityId().toString() : "");
+        formDto.setParentDeptIds(deptIds);
+        formDto.setParentDeptNames(deptNames);
+        // 所有部门（包含街道、社区、网格）
+        deptNames += (StringUtils.isNotEmpty(deptDTO.getGrid()) ? ","+deptDTO.getGrid() : "");
+        deptIds += (deptDTO.getGridId()!=null && deptDTO.getGridId()!= 0 ? ","+deptDTO.getGridId().toString() : "");
+        formDto.setAllDeptIds(deptIds);
+        formDto.setAllDeptNames(deptNames);
         formDto.setGrid(deptDTO.getGrid());
         formDto.setGridId(deptDTO.getGridId());
         // 用户信息

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java

@@ -39,42 +39,58 @@ public class EpdcEventSubmitFormDTO implements Serializable {
      * 图片
      */
     private List<String> images;
+//    /**
+//     * 区
+//     */
+//    private String area;
+//    /**
+//     * 区ID
+//     */
+//    private Long areaId;
+//    /**
+//     * 街道
+//     */
+//    private String street;
+//    /**
+//     * 街道ID
+//     */
+//    private Long streetId;
+//    /**
+//     * 社区
+//     */
+//    private String community;
+//    /**
+//     * 社区ID
+//     */
+//    private Long communityId;
+
     /**
-     * 区
+     * 网格
-     */
-    private String area;
-    /**
-     * 区ID
-     */
-    @NotNull(message = "用户区ID不能为空")
-    private Long areaId;
-    /**
-     * 街道
      */
-    private String street;
+    private String grid;
     /**
-     * 街道ID
+     * 网格ID
      */
-    @NotNull(message = "用户街道ID不能为空")
+    @NotNull(message = "用户网格ID不能为空")
-    private Long streetId;
+    private Long gridId;
     /**
-     * 社区
+     * 父所有部门ID
      */
-    private String community;
+    @NotNull(message = "父所有部门ID不能为空")
+    private String parentDeptIds;
     /**
-     * 社区ID
+     * 父所有部门
      */
-    @NotNull(message = "用户社区ID不能为空")
+    private String parentDeptNames;
-    private Long communityId;
     /**
-     * 网格
+     * 所有部门ID
      */
-    private String grid;
+    @NotNull(message = "所有部门ID不能为空")
+    private String allDeptIds;
     /**
-     * 网格ID
+     * 所有部门
      */
-    @NotNull(message = "用户网格ID不能为空")
+    private String allDeptNames;
-    private Long gridId;
     /**
      * 用户ID
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -66,30 +67,48 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
      * 议题内容
      */
 	private String eventContent;
-    /**
+
-     * 区
+//    /**
-     */
+//     * 区
-	private String area;
+//     */
-    /**
+//	private String area;
-     * 区ID
+//    /**
-     */
+//     * 区ID
-	private Long areaId;
+//     */
-    /**
+//	private Long areaId;
-     * 街道
+//    /**
-     */
+//     * 街道
-	private String street;
+//     */
-    /**
+//	private String street;
-     * 街道ID
+//    /**
-     */
+//     * 街道ID
-	private Long streetId;
+//     */
-    /**
+//	private Long streetId;
-     * 社区
+//    /**
-     */
+//     * 社区
-	private String community;
+//     */
-    /**
+//	private String community;
-     * 社区ID
+//    /**
-     */
+//     * 社区ID
-	private Long communityId;
+//     */
+//	private Long communityId;
+
+	/**
+	 * 父所有部门ID
+	 */
+	private String parentDeptIds;
+	/**
+	 * 父所有部门
+	 */
+	private String parentDeptNames;
+	/**
+	 * 所有部门ID
+	 */
+	private String allDeptIds;
+	/**
+	 * 所有部门
+	 */
+	private String allDeptNames;
     /**
      * 网格
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -71,10 +71,12 @@
                 AND temp.grid_id = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
+                AND (find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
+                OR find_in_set(#{streetId},temp.ALL_DEPT_IDS))
             </if>
             <if test="communityId != null and communityId != ''">
-                AND find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
+                AND (find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
+                OR find_in_set(#{communityId},temp.ALL_DEPT_IDS))
             </if>
             AND temp.EVENT_STATE = 0
         ORDER BY temp.CREATED_TIME DESC

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -27,10 +27,12 @@
                 AND issue.GRID_ID = #{gridId}
             </if>
         <if test="streetId != null and streetId != ''">
-            AND find_in_set(#{streetId},issue.PARENT_DEPT_IDS)
+            AND (find_in_set(#{streetId},issue.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},issue.ALL_DEPT_IDS))
         </if>
         <if test="communityId != null and communityId != ''">
-            AND find_in_set(#{communityId},issue.PARENT_DEPT_IDS)
+            AND (find_in_set(#{communityId},issue.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},issue.ALL_DEPT_IDS))
         </if>
         ORDER BY
             issue.CREATED_TIME DESC
@@ -63,7 +65,7 @@
                 i.ISSUE_ADDRESS,
                 i.ISSUE_LATITUDE,
                 i.ISSUE_LONGITUDE,
-                cate.CATEGORY_NAME,
+                i.CATEGORY_FULL_NAME as CATEGORY_NAME,
                 i.ALL_DEPT_NAMES,
                 i.GROUP_NAME,
                 img.IMG_URL
@@ -71,8 +73,6 @@
                 epdc_issue i
                 LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
 				AND img.DEL_FLAG = '0'
-				LEFT JOIN epdc_event_category cate ON i.ISSUE_CATEGORY_ID = cate.ID
-				AND cate.DEL_FLAG = '0'
             WHERE
                 i.DEL_FLAG = '0'
                 AND i.ID = #{id}
@@ -110,7 +110,7 @@
             i.ISSUE_ADDRESS,
             i.ISSUE_LATITUDE,
             i.ISSUE_LONGITUDE,
-            cate.CATEGORY_NAME,
+            item.CATEGORY_FULL_NAME as CATEGORY_NAME,
             i.ALL_DEPT_NAMES,
             i.GROUP_NAME
         FROM
@@ -119,8 +119,6 @@
             AND e.DEL_FLAG = '0'
             LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
 			AND img.DEL_FLAG = '0'
-			LEFT JOIN epdc_event_category cate ON i.ISSUE_CATEGORY_ID = cate.ID
-	        AND cate.DEL_FLAG = '0'
         WHERE
             i.DEL_FLAG = '0'
             AND i.ID = #{issueId}
@@ -183,7 +181,7 @@
         AND img.DEL_FLAG = '0'
         LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.id
         AND eve.DEL_FLAG = '0'
-        LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.id
+        LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code
         AND cate.DEL_FLAG = '0'
         WHERE
         issue.ID IN (
@@ -204,7 +202,7 @@
                     AND t1.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%')
                 </if>
                 <if test='categoryId != null and categoryId != ""'>
-                    AND t1.ISSUE_CATEGORY_ID = #{categoryId}
+                    AND t1.category_code = #{categoryId}
                 </if>
                 ORDER BY
                 <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
@@ -232,7 +230,7 @@
         <result property="browseNum" column="BROWSE_NUM"/>
         <result property="approveNum" column="APPROVE_NUM"/>
         <result property="opposeNum" column="OPPOSE_NUM"/>
-        <result property="categoryId" column="ISSUE_CATEGORY_ID"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="isOperational" column="isOperational"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
@@ -252,7 +250,7 @@
             issue.NICK_NAME,
             issue.USER_FACE,
             issue.ISSUE_ADDRESS,
-            issue.ISSUE_CATEGORY_ID,
+            issue.CATEGORY_CODE,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.BROWSE_NUM,
@@ -346,7 +344,7 @@
             epdc_issue issue
             LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
-            LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.ID
+            LEFT JOIN epdc_category cate ON issue.CATEGORY_CODE = cate.category_code
             AND cate.DEL_FLAG = '0'
         WHERE
             issue.DEL_FLAG = '0'
@@ -385,7 +383,7 @@
             epdc_events eve
             LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID
             AND img.DEL_FLAG = '0'
-            LEFT JOIN epdc_event_category cate ON eve.ISSUE_CATEGORY_ID = cate.ID
+            LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code
             AND cate.DEL_FLAG = '0'
         WHERE
             eve.DEL_FLAG = '0'
@@ -409,7 +407,7 @@
             epdc_issue issue
             LEFT JOIN epdc_img img ON issue.EVENT_ID = img.REFERENCE_ID
             AND img.DEL_FLAG = '0'
-            LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.ID
+            LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code
             AND cate.DEL_FLAG = '0'
         WHERE
             issue.DEL_FLAG = '0'
@@ -467,15 +465,13 @@
         issue.NICK_NAME,
         issue.USER_FACE,
         issue.IS_PARTY_MEMBER,
-        cate.CATEGORY_NAME,
+        issue.CATEGORY_FULL_NAME as CATEGORY_NAME,
         issue.DISTRIBUTE_TIME,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS STATEMENT_NUM
         FROM
         epdc_issue issue
         LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.id
         AND eve.DEL_FLAG = '0'
-        LEFT JOIN epdc_event_category cate ON issue.ISSUE_CATEGORY_ID = cate.id
-        AND cate.DEL_FLAG = '0'
         WHERE
         issue.ID IN (
             SELECT temp.ID FROM (
@@ -511,7 +507,7 @@
         <result property="content" column="ISSUE_CONTENT"/>
         <result property="mobile" column="MOBILE"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
-        <result property="categoryName" column="DISTRIBUTE_TIME"/>
+        <result property="categoryName" column="CATEGORY_FULL_NAME"/>
         <result property="nickname" column="NICK_NAME"/>
         <result property="avatar" column="USER_FACE"/>
         <result property="address" column="ISSUE_ADDRESS"/>
@@ -533,7 +529,7 @@
         issue.NICK_NAME,
         issue.USER_FACE,
         issue.ISSUE_ADDRESS,
-        issue.ISSUE_CATEGORY_ID,
+        issue.CATEGORY_FULL_NAME,
         eve.APPROVE_NUM,
         eve.OPPOSE_NUM,
         eve.BROWSE_NUM,

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -55,7 +55,7 @@
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
         AND eve.DEL_FLAG = '0'
-        LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
+        LEFT JOIN epdc_category cate ON item.FIRST_CATEGORY_CODE = cate.category_code
         AND cate.DEL_FLAG = '0'
         LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
         AND img.DEL_FLAG = '0'
@@ -89,7 +89,7 @@
                     AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
                 </if>
                 <if test='formDto.categoryId != null and formDto.categoryId != ""'>
-                    AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId}
+                    AND t1.CATEGORY_CODE = #{formDto.categoryId}
                 </if>
                 <if test='formDto.userId != null and formDto.userId != ""'>
                     AND t1.USER_ID = #{formDto.userId}
@@ -125,7 +125,7 @@
         eve.OPPOSE_NUM,
         eve.COMMENT_NUM,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
-        cate.CATEGORY_NAME,
+        item.CATEGORY_FULL_NAME as CATEGORY_NAME,
         img.IMG_URL,
         hp.CREATED_TIME AS handleTime,
         hp.OUT_HANDLE_ADVICE,
@@ -142,8 +142,6 @@
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
         AND eve.DEL_FLAG = '0'
-        LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
-        AND cate.DEL_FLAG = '0'
         LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
         AND img.DEL_FLAG = '0'
         LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID
@@ -201,7 +199,7 @@
         epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
         AND eve.DEL_FLAG = '0'
-        LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
+        LEFT JOIN epdc_category cate ON item.FIRST_CATEGORY_CODE = cate.category_code
         AND cate.DEL_FLAG = '0'
         LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
         AND img.DEL_FLAG = '0'
@@ -234,7 +232,7 @@
             AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
         </if>
         <if test='formDto.categoryId != null and formDto.categoryId != ""'>
-            AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId}
+            AND t1.CATEGORY_CODE = #{formDto.categoryId}
         </if>
         <if test='formDto.userId != null and formDto.userId != ""'>
             AND t1.USER_ID = #{formDto.userId}
@@ -275,7 +273,7 @@
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
         <result property="statementNum" column="statementNum"/>
-        <result property="categoryId" column="ISSUE_CATEGORY_ID"/>
+        <result property="categoryId" column="CATEGORY_CODE"/>
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
         <result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
@@ -298,7 +296,7 @@
             item.NICK_NAME,
             item.USER_FACE,
             item.ISSUE_ADDRESS,
-            item.ISSUE_CATEGORY_ID,
+            item.CATEGORY_CODE,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.BROWSE_NUM,
@@ -349,18 +347,18 @@
             COUNT( item.ID ) AS itemNum,
             SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum,
             cate.CATEGORY_NAME,
-            cate.ID AS categoryId
+            cate.CATEGORY_CODE AS categoryId
         FROM
             epdc_item item
             LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
-            LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
+            LEFT JOIN epdc_category cate ON item.CATEGORY_CODE = cate.category_code
             AND cate.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ITEM_STATE IN (0, 10)
             AND item.GRID_ID = #{gridId}
-            AND item.ISSUE_CATEGORY_ID = #{categoryId}
+            AND item.CATEGORY_CODE = #{categoryId}
     </select>
 
     <select id="selectListOfPendingHandleItems" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">
@@ -407,10 +405,12 @@
                 AND item.GRID_ID = #{gridId}
             </if>
             <if test="streetId != null and streetId != ''">
-                AND find_in_set(#{streetId},item.PARENT_DEPT_IDS)
+                AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS)
+                OR find_in_set(#{streetId},item.ALL_DEPT_IDS))
             </if>
             <if test="communityId != null and communityId != ''">
-                AND find_in_set(#{communityId},item.PARENT_DEPT_IDS)
+                AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS)
+                OR find_in_set(#{communityId},item.ALL_DEPT_IDS))
             </if>
         ORDER BY
             item.CREATED_TIME DESC
@@ -447,15 +447,13 @@
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.COMMENT_NUM,
-            cate.CATEGORY_NAME,
+            item.CATEGORY_FULL_NAME as CATEGORY_NAME,
             img.IMG_URL,
             item.GROUP_NAME
         FROM
             epdc_item item
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
             AND img.DEL_FLAG = '0'
-            LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
-	        AND cate.DEL_FLAG = '0'
 	        LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
         WHERE
@@ -470,7 +468,7 @@
             item.MOBILE,
             item.USER_FACE,
             item.ITEM_CONTENT,
-            cate.CATEGORY_NAME,
+            item.CATEGORY_FULL_NAME as CATEGORY_NAME,
             item.IS_PARTY_MEMBER,
             item.ISSUE_ADDRESS,
             eve.APPROVE_NUM,
@@ -480,12 +478,11 @@
             ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
             item.EVENT_ID,
             img.IMG_URL
+
         FROM
             epdc_item item
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
             AND img.DEL_FLAG = '0'
-            LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
-	        AND cate.DEL_FLAG = '0'
 	        LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
         WHERE
@@ -620,7 +617,7 @@
             item.ISSUE_LATITUDE,
             item.ISSUE_LONGITUDE,
             item.GROUP_NAME,
-            cate.CATEGORY_NAME,
+            item.CATEGORY_FULL_NAME as CATEGORY_NAME,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
             eve.COMMENT_NUM,
@@ -638,8 +635,6 @@
             AND eve.DEL_FLAG = '0'
             LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
 			AND img.DEL_FLAG = '0'
-			LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID
-			AND cate.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
@@ -708,6 +703,7 @@
             pendingTable.pendingHandleNum,
 	        closingTable.closingCaseNum,
             closedTable.closedNum,
+            noticeTable.noticeNum
         FROM
 	           (
            SELECT

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java

@@ -213,35 +213,6 @@ public class UserEntity extends BaseEpdcEntity {
      */
     private String state;
 
-    /**
-     * 区县
-     */
-    private String district;
-
-    /**
-     * 区县ID
-     */
-    private Long districtId;
-
-    /**
-     * 街道
-     */
-    private String street;
-
-    /**
-     * 街道ID
-     */
-    private Long streetId;
-
-    /**
-     * 社区
-     */
-    private String community;
-
-    /**
-     * 社区ID
-     */
-    private Long communityId;
 
     /**
      * 网格

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java

@@ -43,36 +43,6 @@ public class UserGridRelationEntity extends BaseEpdcEntity {
      */
 	private String userId;
 
-    /**
-     * 区县
-     */
-    private String district;
-
-    /**
-     * 区县ID
-     */
-    private Long districtId;
-
-    /**
-     * 街道
-     */
-    private String street;
-
-    /**
-     * 街道ID
-     */
-    private Long streetId;
-
-    /**
-     * 社区
-     */
-    private String community;
-
-    /**
-     * 社区ID
-     */
-    private Long communityId;
-
     /**
      * 所属网格
      */

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -14,11 +14,7 @@
             eu.FACE_IMG AS faceImg,
             eu.MOBILE AS mobile,
             eu.IDENTITY_NO AS identityNo,
-            CONCAT(
+            eu.ALL_DEPT_NAMES AS deptName,
-                eu.DISTRICT,
-                eu.STREET,
-                eu.COMMUNITY
-            ) AS deptName,
             eu.REAL_NAME AS realName,
             eu.ROAD AS road,
             eu.VILLAGE_NAME AS villageName,