添加注释

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

@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * 工作端-议题管理模块
+ */
 @RestController
 @RequestMapping("work/event/")
 public class ApiWorkIssueController {
@@ -22,23 +25,42 @@ public class ApiWorkIssueController {
     private WorkIssueService workIssueService;
 
 
+    /**
+     *议题数据统计
+     * @param formDto
+     * @return
+     */
     @GetMapping("issue/statistics")
     public Result<IssueStateStatisticsResultDTO> statistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
         return workIssueService.stateStatistics(formDto);
 
     }
 
+    /**
+     *待回应列表
+     * @param formDto
+     * @return
+     */
     @GetMapping("issue/list")
     public Result<List<IssuePendingResponseResultDTO>> list(@RequestBody IssuePendingResponseFormDTO formDto) {
         return workIssueService.listIssuePendingResponse(formDto);
     }
 
 
+    /**
+     *事件详情
+     * @param id
+     * @return
+     */
     @GetMapping("event/detail/{id}")
     public Result<EventAppDetailResultDTO> detail(@PathVariable("id") String id) {
         return workIssueService.detail(id);
     }
 
+    /**
+     *事件分类
+     * @return
+     */
     @GetMapping("event/categoryList")
     public Result<List<EventCategoryDTO>> categoryList() {
         return workIssueService.categoryList();

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -6,13 +6,11 @@ import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
-import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback;
 import com.elink.esua.epdc.feign.fallback.WorkIssueFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -20,16 +18,35 @@ import java.util.List;
 @FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkIssueFeignClientFallback.class)
 public interface WorkIssueFeignClient {
 
-    @GetMapping(value = "events/epdc-app/issue/stateStatistics", consumes = MediaType.APPLICATION_JSON_VALUE)
+    /**
+     * 议题数据统计
+     * @param formDto
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/work/issue/stateStatistics", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
 
-    @GetMapping(value = "events/epdc-app/issue/listIssuePendingResponse", consumes = MediaType.APPLICATION_JSON_VALUE)
+    /**
+     * 待回应列表
+     * @param formDto
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/work/issue/listIssuePendingResponse", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
-    @GetMapping(value = "events/epdc-app/event/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    /**
+     * 事件详情
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/work/event/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<EventAppDetailResultDTO> detail(@PathVariable String id);
 
-    @GetMapping(value = "events/epdc-app/issue/categoryList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    /**
+     * 事件分类
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/work/issue/categoryList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EventCategoryDTO>> categoryList();
 
 }

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

@@ -30,11 +30,30 @@ import java.util.List;
 
 public interface WorkIssueService {
 
+    /**
+     *议题数据统计
+     * @param formDto
+     * @return
+     */
     Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
 
+    /**
+     *待回应列表
+     * @param formDto
+     * @return
+     */
     Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
+    /**
+     *事件详情
+     * @param id
+     * @return
+     */
     Result<EventAppDetailResultDTO> detail(String id);
 
+    /**
+     *事件分类
+     * @return
+     */
     Result<List<EventCategoryDTO>> categoryList();
 }

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

@@ -38,21 +38,40 @@ public class WorkIssueServiceImpl implements WorkIssueService {
     @Autowired
     private WorkIssueFeignClient workIssueFeignClient;
 
+    /**
+     *议题数据统计
+     * @param formDto
+     * @return
+     */
     @Override
     public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
         return workIssueFeignClient.stateStatistics(formDto);
     }
 
+    /**
+     *待回应列表
+     * @param formDto
+     * @return
+     */
     @Override
     public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
         return workIssueFeignClient.listIssuePendingResponse(formDto);
     }
 
+    /**
+     *事件详情
+     * @param id
+     * @return
+     */
     @Override
     public Result<EventAppDetailResultDTO> detail(String id) {
         return workIssueFeignClient.detail(id);
     }
 
+    /**
+     *事件分类
+     * @return
+     */
     @Override
     public Result<List<EventCategoryDTO>> categoryList() {
         return workIssueFeignClient.categoryList();

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

@@ -28,8 +28,14 @@ public class EpdcEventsDetailDTO implements Serializable {
      */
     private String mobile;
 
+    /**
+     * 用户头像
+     */
     private String userFace;
 
+    /**
+     * 党员标志
+     */
     private String partyFlag;
 
     /**

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

@@ -8,6 +8,8 @@ import java.util.List;
 @Data
 public class IssuePendingResponseFormDTO implements Serializable {
 
+    private Integer state;
+
     private Long deptId;
 
     private List deptIdList;

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java

@@ -5,7 +5,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
-import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +36,4 @@ public class EpdcAppEventsController {
         return new Result();
     }
 
-    @GetMapping("{id}")
-    public Result<EpdcEventsDetailDTO> detail(@PathVariable("id") String id){
-        EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
-        return new Result<EpdcEventsDetailDTO>().ok(data);
-    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppWorkEventsController.java

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.modules.events.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
+import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(Constant.EPDC_APP + "work/event")
+public class EpdcAppWorkEventsController {
+
+    @Autowired
+    private EpdcEventsService epdcEventsService;
+
+    /**
+     * 事件详情
+     * @param id
+     * @return
+     */
+    @GetMapping("{id}")
+    public Result<EpdcEventsDetailDTO> detail(@PathVariable("id") String id){
+        EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
+        return new Result<EpdcEventsDetailDTO>().ok(data);
+    }
+}

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

@@ -182,8 +182,19 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      */
     void initMenuNotice();
 
+    /**
+     * 根据状态和网格id查询书量
+     * @param deptIdList
+     * @param state
+     * @return
+     */
     int selectCountOfEventState(List<Long> deptIdList, int state);
 
+    /**
+     * 待回应列表
+     * @param formDto
+     * @return
+     */
     Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java

@@ -3,19 +3,15 @@ package com.elink.esua.epdc.modules.issue.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.category.EventCategoryDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
-import com.elink.esua.epdc.modules.category.service.EventCategoryService;
 import com.elink.esua.epdc.modules.issue.service.EventUserAttitudeService;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 移动端-议题表
@@ -32,8 +28,6 @@ public class EpdcAppIssueController {
     @Autowired
     private EventUserAttitudeService eventUserAttitudeService;
 
-    @Autowired
-    private EventCategoryService eventCategoryService;
 
     /**
      * 最新最热列表
@@ -122,27 +116,4 @@ public class EpdcAppIssueController {
         return issueService.getEventDetail(eventId);
     }
 
-    /**
-     * 议题状态统计
-     * @param formDto
-     * @return
-     */
-    @GetMapping("stateStatistics")
-    public Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
-       return issueService.stateStatistics(formDto);
-    }
-
-    @GetMapping("listIssuePendingResponse")
-    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto) {
-        return issueService.listIssuePendingResponse(formDto);
-
-    }
-
-    @GetMapping("categoryList")
-    public Result<List<EventCategoryDTO>> categoryList() {
-        Map params = new HashMap<>();
-        List<EventCategoryDTO> list = eventCategoryService.list(params);
-        return new Result<List<EventCategoryDTO>>().ok(list);
-    }
-
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppWorkIssueController.java

@@ -0,0 +1,65 @@
+package com.elink.esua.epdc.modules.issue.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO;
+import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
+import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO;
+import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
+import com.elink.esua.epdc.modules.category.service.EventCategoryService;
+import com.elink.esua.epdc.modules.issue.service.IssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(Constant.EPDC_APP + "work/issue")
+public class EpdcAppWorkIssueController {
+
+
+    @Autowired
+    private IssueService issueService;
+
+    @Autowired
+    private EventCategoryService eventCategoryService;
+
+    /**
+     * 议题状态统计
+     * @param formDto
+     * @return
+     */
+    @GetMapping("stateStatistics")
+    public Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto) {
+        return issueService.stateStatistics(formDto);
+    }
+
+    /**
+     *待回应列表
+     * @param formDto
+     * @return
+     */
+    @GetMapping("listIssuePendingResponse")
+    public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto) {
+        return issueService.listIssuePendingResponse(formDto);
+
+    }
+
+    /**
+     *事件分类
+     * @return
+     */
+    @GetMapping("categoryList")
+    public Result<List<EventCategoryDTO>> categoryList() {
+        Map params = new HashMap<>();
+        List<EventCategoryDTO> list = eventCategoryService.list(params);
+        return new Result<List<EventCategoryDTO>>().ok(list);
+    }
+
+}

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

@@ -215,11 +215,16 @@ public interface IssueService extends BaseService<IssueEntity> {
     void sendIssueHandleMenuNotice(Long deptId, Long userId);
 
     /**
-     * 移动端-议题状态统计
+     * 工作端-议题状态统计
      * @param formDto
      * @return
      */
     Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
 
+    /**
+     * 工作端-待回应列表
+     * @param formDto
+     * @return
+     */
     Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
 }

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

@@ -376,6 +376,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return itemEntity;
     }
 
+    /**
+     *议题数据统计
+     * @param formDto
+     * @return
+     */
     @Override
     public Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto) {
         List<Long> list;
@@ -399,6 +404,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         return new Result<IssueStateStatisticsResultDTO>().ok(dto);
     }
 
+    /**
+     *待回应列表
+     * @param formDto
+     * @return
+     */
     @Override
     public Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) {
         return epdcEventsService.listIssuePendingResponse(formDto);

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

@@ -283,7 +283,7 @@
         <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND EVENT_STATE = 0
+        AND EVENT_STATE = #{state}
         <if test="formDto.timestamp != null">
             <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
         </if>