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

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@@ -98,14 +98,14 @@ public class ApiIssueController {
 
     /**
      * 议题分类统计
-     * @Params: [userDetail, categoryId]
+     * @Params: [userDetail, categoryCode]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/9 12:26
      */
-    @GetMapping("statistics/{categoryId}")
+    @GetMapping("statistics/{categoryCode}")
-    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryId) {
+    public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) {
-        return issueService.getIssueCategoryStatistics(userDetail, categoryId);
+        return issueService.getIssueCategoryStatistics(userDetail, categoryCode);
     }
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@@ -60,14 +60,14 @@ public class ApiItemController {
 
     /**
      * 项目分类统计
-     * @Params: [userDetail, categoryId]
+     * @Params: [userDetail, categoryCode]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/12 13:26
      */
-    @GetMapping("statistics/{categoryId}")
+    @GetMapping("statistics/{categoryCode}")
-    public Result<ItemCategoryStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryId) {
+    public Result<ItemCategoryStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) {
-        return itemService.getItemCategoryStatistics(userDetail, categoryId);
+        return itemService.getItemCategoryStatistics(userDetail, categoryCode);
     }
 
     /**

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

@@ -64,12 +64,12 @@ public interface IssueService {
 
     /**
      * 议题分类统计
-     * @Params: [userDetail, categoryId]
+     * @Params: [userDetail, categoryCode]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/9 12:27
      */
-    Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryId);
+    Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryCode);
 
     /**
      * 议题处理进度

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

@@ -42,12 +42,12 @@ public interface ItemService {
 
     /**
      * 项目分类统计
-     * @Params: [userDetail, categoryId]
+     * @Params: [userDetail, categoryCode]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO>
      * @Author: liuchuang
      * @Date: 2019/9/12 13:27
      */
-    Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryId);
+    Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryCode);
 
     /**
      * 项目处理进度

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

@@ -152,12 +152,12 @@ public class IssueServiceImpl implements IssueService {
     }
 
     @Override
-    public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryId) {
+    public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryCode) {
         if (null == userDetail) {
             return new Result<IssueCategoryStatisticsResultDTO>().error("获取用户信息失败");
         }
         IssueCategoryStatisticsFormDTO formDto = new IssueCategoryStatisticsFormDTO();
-        formDto.setCategoryId(categoryId);
+        formDto.setCategoryCode(categoryCode);
         formDto.setGridId(userDetail.getGridId());
         return issueFeignClient.issueCategoryStatistics(formDto);
     }

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

@@ -57,12 +57,12 @@ public class ItemServiceImpl implements ItemService {
     }
 
     @Override
-    public Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryId) {
+    public Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryCode) {
         if (null == userDetail) {
             return new Result<ItemCategoryStatisticsResultDTO>().error("获取用户信息失败");
         }
         ItemCategoryStatisticsFormDTO formDto = new ItemCategoryStatisticsFormDTO();
-        formDto.setCategoryId(categoryId);
+        formDto.setCategoryCode(categoryCode);
         formDto.setGridId(userDetail.getGridId());
         return itemFeignClient.itemCategoryStatistics(formDto);
     }

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

@@ -110,7 +110,7 @@ public class WorkUserServiceImpl implements WorkUserService {
 
     /***
      * 获取用户待审核列表
-     * @param userDetail
+     * @param
      * @param workUserFromDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
      * @author qushutong
@@ -118,7 +118,7 @@ public class WorkUserServiceImpl implements WorkUserService {
      */
     @Override
     public Result<List<EpdcWorkUserResultDTO>> listWorkUser(EpdcWorkUserFromDTO workUserFromDto) {
-        if (null == workUserFromDto.getGridId()) {
+        if (null == workUserFromDto.getGridId()||0 == workUserFromDto.getGridId()) {
             UserDetail user = SecurityUser.getUser();
             workUserFromDto.setGridIdList(user.getDeptIdList());
         }
@@ -158,7 +158,7 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
     /**
-     * @param userDetail
+     * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
      * @Author yinzuomei
      * @Description 首页面板 获取工作端APP菜单

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

@@ -23,5 +23,5 @@ public class IssueCategoryStatisticsFormDTO implements Serializable {
      * 议题类别ID
      */
     @NotBlank(message = "议题类别ID不能为空")
-    private String categoryId;
+    private String categoryCode;
 }

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

@@ -52,5 +52,5 @@ public class IssueFormDTO implements Serializable {
     /**
      * 议题分类ID
      */
-    private String categoryId;
+    private String categoryCode;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueCategoryStatisticsResultDTO.java

@@ -16,7 +16,7 @@ public class IssueCategoryStatisticsResultDTO implements Serializable {
     /**
      * 类别ID
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 类别名称
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java

@@ -62,7 +62,7 @@ public class IssueDetailResultDTO implements Serializable {
     /**
      * 所属类别ID
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 用户是否赞过，false未赞
      */

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

@@ -24,5 +24,5 @@ public class ItemCategoryStatisticsFormDTO implements Serializable {
      * 议题类别ID
      */
     @NotBlank(message = "议题类别ID不能为空")
-    private String categoryId;
+    private String categoryCode;
 }

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

@@ -47,7 +47,7 @@ public class ItemFormDTO implements Serializable {
     /**
      * 议题分类ID
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 用户ID
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemCategoryStatisticsResultDTO.java

@@ -16,7 +16,7 @@ public class ItemCategoryStatisticsResultDTO implements Serializable {
     /**
      * 类别ID
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 类别名称
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@@ -95,7 +95,7 @@ public class ItemDetailResultDTO implements Serializable {
     /**
      * 所属类别ID
      */
-    private String categoryId;
+    private String categoryCode;
     /**
      * 用户是否赞过，false未赞
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -174,7 +174,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         EpdcEventsEntity entity = new EpdcEventsEntity();
         entity.setId(dto.getId());
         entity.setEventState(dto.getEventState());
-        entity.setIssueCategoryId(dto.getCategoryId());
+        entity.setCategoryCode(dto.getCategoryId());
         entity.setAdvice(dto.getAdvice());
         // 更新事件表审核状态
         updateById(entity);
@@ -340,10 +340,14 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueEntity.setStreetId(entity.getStreetId());
         issueEntity.setCommunity(entity.getCommunity());
         issueEntity.setCommunityId(entity.getCommunityId());
+        issueEntity.setParentDeptIds(entity.getParentDeptIds());
+        issueEntity.setParentDeptNames(entity.getParentDeptNames());
+        issueEntity.setAllDeptIds(entity.getAllDeptIds());
+        issueEntity.setAllDeptNames(entity.getAllDeptNames());
         issueEntity.setGrid(entity.getGrid());
         issueEntity.setGridId(entity.getGridId());
         issueEntity.setIssueAddress(entity.getIssueAddress());
-        issueEntity.setIssueCategoryId(entity.getIssueCategoryId());
+        issueEntity.setCategoryCode(entity.getCategoryCode());
         issueEntity.setIssueLatitude(entity.getIssueLatitude());
         issueEntity.setIssueLongitude(entity.getIssueLongitude());
         issueEntity.setGroupId(entity.getGroupId());

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

@@ -108,6 +108,22 @@ public class IssueEntity extends BaseEpdcEntity {
      * 社区ID
      */
 	private Long communityId;
+	/**
+	 * 父所有部门ID
+	 */
+	private String parentDeptIds;
+	/**
+	 * 父所有部门
+	 */
+	private String parentDeptNames;
+	/**
+	 * 所有部门ID
+	 */
+	private String allDeptIds;
+	/**
+	 * 所有部门
+	 */
+	private String allDeptNames;
 
     /**
      * 网格
@@ -127,7 +143,7 @@ public class IssueEntity extends BaseEpdcEntity {
     /**
      * 议题分类ID
      */
-	private String issueCategoryId;
+	private String categoryCode;
 
     /**
      * 议题位置纬度

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -388,11 +388,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setAreaId(issueEntity.getAreaId());
         itemEntity.setStreet(issueEntity.getStreet());
         itemEntity.setStreetId(issueEntity.getStreetId());
+        itemEntity.setParentDeptIds(issueEntity.getParentDeptIds());
+        itemEntity.setParentDeptNames(issueEntity.getParentDeptNames());
+        itemEntity.setAllDeptIds(issueEntity.getAllDeptIds());
+        itemEntity.setAllDeptNames(issueEntity.getAllDeptNames());
         itemEntity.setGrid(issueEntity.getGrid());
         itemEntity.setGridId(issueEntity.getGridId());
         itemEntity.setCommunity(issueEntity.getCommunity());
         itemEntity.setCommunityId(issueEntity.getCommunityId());
-        itemEntity.setIssueCategoryId(issueEntity.getIssueCategoryId());
+        itemEntity.setCategoryCode(issueEntity.getCategoryCode());
         itemEntity.setIssueAddress(issueEntity.getIssueAddress());
         itemEntity.setIssueLongitude(issueEntity.getIssueLongitude());
         itemEntity.setIssueLatitude(issueEntity.getIssueLatitude());

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

@@ -108,6 +108,22 @@ public class ItemEntity extends BaseEpdcEntity {
      * 社区ID
      */
     private Long communityId;
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 
     /**
      * 网格
@@ -127,7 +143,7 @@ public class ItemEntity extends BaseEpdcEntity {
     /**
      * 议题分类ID
      */
-    private String issueCategoryId;
+    private String categoryCode;
 
     /**
      * 议题位置纬度

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -208,6 +208,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result<List<ItemResultDTO>> listItemsByWork(ItemFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
         formDto.setPageIndex(pageIndex);
+        System.out.println("userid");
+        System.out.println(SecurityUser.getUserId());
+        System.out.println("user");
+        System.out.println(SecurityUser.getUser());
+        System.out.println(SecurityUser.getUser().getDeptIdList());
         List<ItemResultDTO> data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList());
         return new Result<List<ItemResultDTO>>().ok(data);
     }

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

@@ -201,8 +201,8 @@
                 <if test='searchContent != null and searchContent != ""'>
                     AND t1.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%')
                 </if>
-                <if test='categoryId != null and categoryId != ""'>
+                <if test='categoryCode != null and categoryCode != ""'>
-                    AND t1.category_code = #{categoryId}
+                    AND t1.category_code = #{categoryCode}
                 </if>
                 ORDER BY
                 <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
@@ -339,7 +339,7 @@
             COUNT( issue.ID ) AS issueNum,
             SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum,
             cate.CATEGORY_NAME,
-            cate.ID AS categoryId
+            cate.ID AS categoryCode
         FROM
             epdc_issue issue
             LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID
@@ -350,7 +350,7 @@
             issue.DEL_FLAG = '0'
             AND issue.ISSUE_STATE = 0
             AND issue.GRID_ID = #{gridId}
-            AND issue.ISSUE_CATEGORY_ID = #{categoryId}
+            AND issue.ISSUE_CATEGORY_ID = #{categoryCode}
     </select>
 
     <resultMap id="issuesAndEventsOfMineMap" type="com.elink.esua.epdc.dto.issue.result.IssuesAndEventsOfMineResultDTO">

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

@@ -88,8 +88,8 @@
                 <if test='formDto.searchContent != null and formDto.searchContent != ""'>
                     AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
                 </if>
-                <if test='formDto.categoryId != null and formDto.categoryId != ""'>
+                <if test='formDto.categoryCode != null and formDto.categoryCode != ""'>
-                    AND t1.CATEGORY_CODE = #{formDto.categoryId}
+                    AND t1.CATEGORY_CODE = #{formDto.categoryCode}
                 </if>
                 <if test='formDto.userId != null and formDto.userId != ""'>
                     AND t1.USER_ID = #{formDto.userId}
@@ -231,8 +231,8 @@
         <if test='formDto.searchContent != null and formDto.searchContent != ""'>
             AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
         </if>
-        <if test='formDto.categoryId != null and formDto.categoryId != ""'>
+        <if test='formDto.categoryCode != null and formDto.categoryCode != ""'>
-            AND t1.CATEGORY_CODE = #{formDto.categoryId}
+            AND t1.CATEGORY_CODE = #{formDto.categoryCode}
         </if>
         <if test='formDto.userId != null and formDto.userId != ""'>
             AND t1.USER_ID = #{formDto.userId}
@@ -273,7 +273,7 @@
         <result property="opposeNum" column="OPPOSE_NUM"/>
         <result property="commentNum" column="COMMENT_NUM"/>
         <result property="statementNum" column="statementNum"/>
-        <result property="categoryId" column="CATEGORY_CODE"/>
+        <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="isOperational" column="isOperational"/>
         <result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
         <result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
@@ -347,7 +347,7 @@
             COUNT( item.ID ) AS itemNum,
             SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum,
             cate.CATEGORY_NAME,
-            cate.CATEGORY_CODE AS categoryId
+            cate.CATEGORY_CODE AS categoryCode
         FROM
             epdc_item item
             LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
@@ -358,7 +358,7 @@
             item.DEL_FLAG = '0'
             AND item.ITEM_STATE IN (0, 10)
             AND item.GRID_ID = #{gridId}
-            AND item.CATEGORY_CODE = #{categoryId}
+            AND item.CATEGORY_CODE = #{categoryCode}
     </select>
 
     <select id="selectListOfPendingHandleItems" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">

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

@@ -266,12 +266,12 @@
             epdc_user_grid_relation ug
             LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
         WHERE
-            u.PART_FLAG = #{partyFlag}
+            u.PARTY_FLAG = #{partyFlag}
             AND u.STATE = #{authenticatedFlag}
             AND u.DEL_FLAG = '0'
             AND ug.DEL_FLAG = '0'
             <choose>
-                <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
+                <when test="gridId != null and gridId>0">AND ug.GRID_ID = #{gridId}</when>
                 <otherwise>
                     AND ug.GRID_ID in
                     <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >