项目管理接口调整

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

@@ -33,7 +33,7 @@ public class ApiWorkItemController {
      * @Date: 2019/11/18 13:26
      */
     @GetMapping("statistics")
-    public Result<ItemStatisticsResultDTO> itemStatistics(@RequestBody ItemStatisticsFormDTO formDto) {
+    public Result<ItemStatisticsResultDTO> itemStatistics(ItemStatisticsFormDTO formDto) {
         return workItemService.getItemStatistics(formDto);
     }
     /**
@@ -44,7 +44,7 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("list")
-    public Result<List<ItemResultDTO>> listItems(@RequestBody ItemFormDTO formDto) {
+    public Result<List<ItemResultDTO>> listItems(ItemFormDTO formDto) {
         return workItemService.listItems(formDto);
     }
 
@@ -67,7 +67,7 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("evaluation")
-    public Result<List<ItemDeptEvaluateResultDTO>> evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+    public Result<List<ItemDeptEvaluateResultDTO>> evaluation(EvaluationFormDTO evaluationFormDTO) {
         return workItemService.evaluation(evaluationFormDTO);
     }
     /**
@@ -83,7 +83,7 @@ public class ApiWorkItemController {
     }
 
     @GetMapping("handleSubmit")
-    public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
+    public Result handleSubmit(ItemHandleSubmitFormDTO dto) {
         return workItemService.handleSubmit(dto);
     }
     /**
@@ -94,7 +94,7 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("evaluationDept")
-    public Result<List<ItemEvaluateDeptDTO>> evaluationDept(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+    public Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO) {
         return workItemService.evaluationDept(evaluationFormDTO);
     }
     /**
@@ -105,7 +105,7 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("processList")
-    public Result<List<ItemHandleProgressResultDTO>> processList(@RequestBody ItemProcessFormDTO dto) {
+    public Result<List<ItemHandleProgressResultDTO>> processList(ItemProcessFormDTO dto) {
         return workItemService.processList(dto);
     }
 
@@ -117,7 +117,7 @@ public class ApiWorkItemController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("notice")
-    public Result<List<ItemInformationResultDTO>> notice(@RequestBody ItemInformationFormDTO formDto) {
+    public Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto) {
         return workItemService.notice(formDto);
     }
 }

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

@@ -21,7 +21,7 @@ import java.util.List;
  * @Author LPF
  * @Date 2019/11/18 16:39
  */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class,url ="http://127.0.0.1:9066")
 public interface WorkItemFeignClient {
 
 
@@ -51,8 +51,8 @@ public interface WorkItemFeignClient {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:42
      */
-    @GetMapping(value = "events/work/item/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "events/work/item/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto);
+    Result<ItemDetailResultDTO> getItemDetail(@PathVariable String id);
 
     /**
      * 获取满意度评价结果

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

@@ -32,8 +32,8 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItems", formDto);
     }
     @Override
-    public Result<ItemDetailResultDTO> getItemDetail(ItemDetailFormDTO formDto) {
+    public Result<ItemDetailResultDTO> getItemDetail(@PathVariable String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", formDto);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemDetail", id);
     }
 
     @Override

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

@@ -44,9 +44,7 @@ public class WorkItemServiceImpl implements WorkItemService {
 
     @Override
     public Result<ItemDetailResultDTO> getItemDetail(String itemId) {
-        ItemDetailFormDTO formDto = new ItemDetailFormDTO();
+        return workItemFeignClient.getItemDetail(itemId);
-        formDto.setItemId(itemId);
-        return workItemFeignClient.getItemDetail(formDto);
     }
 
 

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

@@ -40,7 +40,7 @@ public class WorkItemController {
 
 
     /**
-     * 项目分类统计
+     * 项目统计--工作端
      * @Params: [formDto]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO>
      * @Author: liuchuang
@@ -52,7 +52,7 @@ public class WorkItemController {
         return this.itemService.getItemStatistics(formDto);
     }
     /**
-     * 项目列表--移动app端用
+     * 项目列表--工作端
      * @Params: [formDto]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
      * @Author: lipengfei
@@ -64,7 +64,7 @@ public class WorkItemController {
         return this.itemService.listItemsByWork(formDto);
     }
     /**
-     * 项目消息列表--移动app端用
+     * 项目消息列表--工作端
      * @Params: [formDto]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
      * @Author: lipengfei
@@ -77,21 +77,18 @@ public class WorkItemController {
         return this.itemInformationService.notice(formDto);
     }
     /**
-     * 项目详情--移动app端用
+     * 项目详情--工作端
-     * @Params: [formDto]
+     * @Params: [id]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO>
      * @Author: lipengfei
      * @Date: 2019/11/19 16:46
      */
-    @GetMapping("detail")
+    @GetMapping("detail/{id}")
-    public Result<ItemDetailResultDTO> getItemDetail(@RequestBody ItemDetailFormDTO formDto) {
+    public Result<ItemDetailResultDTO> getItemDetail(@PathVariable String id) {
-        //略过FormDto不相关检验
+        return this.itemService.getItemDetailByWork(id);
-        formDto.setUserId("NoUser");
-        ValidatorUtils.validateEntity(formDto);
-        return this.itemService.getItemDetailByWork(formDto);
     }
     /**
-     * 工作端-获取满意度评价结果
+     * 获取满意度评价结果--工作端
      * @Params: [evaluationFormDTO]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result
      * @Author: lipengfei
@@ -106,7 +103,7 @@ public class WorkItemController {
         return new Result<List<ItemDeptEvaluateResultDTO>>().ok(deptEvaluateResultDTOS);
     }
     /**
-     * 工作端-获取可吹哨部门
+     * 获取可吹哨部门--工作端
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result
      * @Author: lipengfei
      * @Date: 2019/11/19 16:34
@@ -116,7 +113,7 @@ public class WorkItemController {
         return this.itemService.whistlingDept();
     }
     /**
-     * 项目处理提交
+     * 项目处理提交--工作端
      * @Params: [dto]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result
      * @Author: lipengfei
@@ -128,7 +125,7 @@ public class WorkItemController {
         return itemService.modifyHandleResult(dto);
     }
     /**
-     * 工作端-获取满意度评价部门
+     * 获取满意度评价部门--工作端
      * @Params: [evaluationFormDTO]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result
      * @Author: lipengfei
@@ -143,7 +140,7 @@ public class WorkItemController {
         return new Result<List<ItemEvaluateDeptDTO>>().ok(evaluateDeptDTOS);
     }
     /**
-     * 工作端-获项目处理进度
+     * 获项目处理进度--工作端
      * @Params: [ItemProcessFormDTO]
      * @Return: com.elink.esua.epdc.commons.tools.utils.Result
      * @Author: lipengfei

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -78,6 +78,15 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Date: 2019/9/10 20:57
      */
     ItemDetailResultDTO selectOneItemDetail(ItemDetailFormDTO formDto);
+
+    /**
+     * 工作端-项目列表
+     * @Params: [formDto,deptIdList]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:50
+     */
+    List<ItemResultDTO> selectListOfItemsByWork(ItemFormDTO formDto,List<Long> deptIdList);
     /**
      * 工作端-项目详情
      * @Params: [formDto]
@@ -85,7 +94,7 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Author: lipengfei
      * @Date: 2019/9/10 20:57
      */
-    ItemDetailResultDTO selectOneOfItemDetailForWork(ItemDetailFormDTO formDto);
+    ItemDetailResultDTO selectOneOfItemDetailForWork(String id);
 
 
     /**

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

@@ -158,7 +158,7 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Author: lipengfei
      * @Date: 2019/9/10 20:54
      */
-    Result<ItemDetailResultDTO> getItemDetailByWork(ItemDetailFormDTO formDto);
+    Result<ItemDetailResultDTO> getItemDetailByWork(String id);
 
 
     /**

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

@@ -208,16 +208,12 @@ 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);
-        // 查询半年内的数据
+        List<ItemResultDTO> data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList());
-        formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6));
-        // 查询项目状态 0-待处理，5-已关闭，10-已结案
-        int[] states = {EventIssueItemState.ITEM_HANDLING,EventIssueItemState.ITEM_CLOSED, EventIssueItemState.ITEM_CLOSEING_CASE};
-        List<ItemResultDTO> data = baseDao.selectListOfItems(formDto, states);
         return new Result<List<ItemResultDTO>>().ok(data);
     }
     @Override
-    public Result<ItemDetailResultDTO> getItemDetailByWork(ItemDetailFormDTO formDto) {
+    public Result<ItemDetailResultDTO> getItemDetailByWork(String id) {
-        ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(formDto);
+        ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(id);
         return new Result<ItemDetailResultDTO>().ok(resultDTO);
     }
 
@@ -383,6 +379,31 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     @Override
     public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(){
+        UserDetail user = SecurityUser.getUser();
+        List<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>();
+        // 网格-可做操作和可流转部门
+        if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
+            // 可流转部门
+            Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(SecurityUser.getDeptId());
+            if (!completeDept.success()) {
+                throw new RenException("获取流转协助部门失败");
+            }
+
+            CompleteDeptDTO completeDeptDTO = completeDept.getData();
+            // 直属社区
+            ItemCirculationDeptResultDTO circulationDeptCommunityResultDTO = new ItemCirculationDeptResultDTO();
+            circulationDeptCommunityResultDTO.setDeptId(completeDeptDTO.getCommunityId());
+            circulationDeptCommunityResultDTO.setDeptName(completeDeptDTO.getCommunity());
+            circulationDeptCommunityResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY);
+            deptResultDTOS.add(circulationDeptCommunityResultDTO);
+            // 直属街道
+            ItemCirculationDeptResultDTO circulationDeptStreetResultDTO = new ItemCirculationDeptResultDTO();
+            circulationDeptStreetResultDTO.setDeptId(completeDeptDTO.getStreetId());
+            circulationDeptStreetResultDTO.setDeptName(completeDeptDTO.getStreet());
+            circulationDeptStreetResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY);
+            deptResultDTOS.add(circulationDeptStreetResultDTO);
+
+        } else if (OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(user.getTypeKey())) {
             // 可流转部门
             Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(SecurityUser.getDeptId());
             if (!listResult.success()) {
@@ -390,7 +411,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             List<SysDeptDTO> deptDTOS = listResult.getData();
             // 初始化可流转部门-街道党工委：街道部门、区直部门
-        List<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>();
             for (SysDeptDTO dto :
                     deptDTOS) {
                 ItemCirculationDeptResultDTO circulationDeptResultDTO = new ItemCirculationDeptResultDTO();
@@ -399,6 +419,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 circulationDeptResultDTO.setTypeKey(dto.getTypeKey());
                 deptResultDTOS.add(circulationDeptResultDTO);
             }
+
+        }
         return new Result<List<ItemCirculationDeptResultDTO>>().ok(deptResultDTOS);
     }
 

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

@@ -37,10 +37,6 @@
         item.USER_FACE,
         item.IS_PARTY_MEMBER,
         item.CREATED_TIME,
-        item.ISSUE_ADDRESS,
-        eve.APPROVE_NUM,
-        eve.OPPOSE_NUM,
-        eve.COMMENT_NUM,
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
         cate.CATEGORY_NAME,
         img.IMG_URL,
@@ -116,6 +112,63 @@
         item.CREATED_TIME DESC,
         img.IMG_URL
     </select>
+    <select id="selectListOfItemsByWork" resultMap="itemsMap">
+        SELECT
+        item.ID,
+        item.ITEM_CONTENT,
+        item.NICK_NAME,
+        item.USER_FACE,
+        item.IS_PARTY_MEMBER,
+        item.CREATED_TIME,
+        item.ISSUE_ADDRESS,
+        eve.APPROVE_NUM,
+        eve.OPPOSE_NUM,
+        eve.COMMENT_NUM,
+        ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
+        cate.CATEGORY_NAME,
+        img.IMG_URL,
+        hp.CREATED_TIME AS handleTime,
+        hp.OUT_HANDLE_ADVICE,
+        CASE
+        item.ITEM_STATE
+        WHEN 0 THEN
+        '处理中'
+        WHEN 5 THEN
+        '已关闭'
+        WHEN 10 THEN
+        '已结案' ELSE ''
+        END AS stateName
+        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
+        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
+        AND hp.DEL_FLAG = '0'
+        AND hp.CREATED_TIME = ( SELECT MAX( a.CREATED_TIME ) FROM epdc_item_handle_process a WHERE a.DEL_FLAG = '0' AND a.ITEM_ID = hp.ITEM_ID )
+        LEFT JOIN epdc_item_dept dept ON item.Id = dept.ITEM_ID AND dept.DEL_FLAG = '0'
+        WHERE
+        item.DEL_FLAG = '0'
+        <if test="formDto.timestamp != null">
+            <![CDATA[ AND DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{formDto.timestamp}
+        </if>
+        AND dept.DEPT_ID IN
+        <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
+            #{deptIdItem}
+        </foreach>
+        <if test="formDto.deptId != null">
+            AND dept.DEPT_ID = #{formDto.deptId}
+        </if>
+        <if test='formDto.itemState != null '>
+            AND item.ITEM_STATE = #{formDto.itemState}
+        </if>
+        ORDER BY
+        item.CREATED_TIME DESC
+        LIMIT #{formDto.pageIndex},#{formDto.pageSize}
+    </select>
 
     <select id="selectListItemsOfMine" resultMap="itemsMap">
         SELECT