移动端我的项目列表接口 init

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

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemOfMineFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
@@ -80,4 +81,16 @@ public class ApiItemController {
     public Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable String itemId) {
         return itemService.getItemHandleProgress(itemId);
     }
+
+    /**
+     * 我的项目列表
+     * @Params: [userDetail, formDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 13:27
+     */
+    @GetMapping("listByUserId")
+    public Result<List<ItemResultDTO>> listItemsOfMine(@LoginUser TokenDto userDetail, @RequestBody ItemOfMineFormDTO formDTO) {
+        return itemService.listItemsOfMine(userDetail, formDTO);
+    }
 }

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

@@ -2,10 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO;
-import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
@@ -70,4 +67,14 @@ public interface ItemFeignClient {
      */
     @GetMapping(value = "events/epdc-app/item/progress/{itemId}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable String itemId);
+
+    /**
+     * 我的项目列表
+     * @Params: [formDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 13:33
+     */
+    @GetMapping(value = "events/epdc-app/item/listByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemResultDTO>> listItemsOfMine(ItemOfMineFormDTO formDTO);
 }

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

@@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
@@ -48,4 +45,9 @@ public class ItemFeignClientFallback implements ItemFeignClient {
     public Result<List<ItemHandleProgressResultDTO>> itemHandleProgress(@PathVariable String itemId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemHandleProgress", itemId);
     }
+
+    @Override
+    public Result<List<ItemResultDTO>> listItemsOfMine(ItemOfMineFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "listItemsOfMine", formDTO);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.ItemOfMineFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
@@ -56,4 +57,13 @@ public interface ItemService {
      * @Date: 2019/9/17 11:08
      */
     Result<List<ItemHandleProgressResultDTO>> getItemHandleProgress(String itemId);
+
+    /**
+     * 我的项目列表
+     * @Params: [userDetail, formDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 13:27
+     */
+    Result<List<ItemResultDTO>> listItemsOfMine(TokenDto userDetail, ItemOfMineFormDTO formDTO);
 }

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

@@ -2,16 +2,14 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO;
-import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
 import com.elink.esua.epdc.feign.ItemFeignClient;
 import com.elink.esua.epdc.service.ItemService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,4 +59,14 @@ public class ItemServiceImpl implements ItemService {
     public Result<List<ItemHandleProgressResultDTO>> getItemHandleProgress(String itemId) {
         return itemFeignClient.itemHandleProgress(itemId);
     }
+
+    @Override
+    public Result<List<ItemResultDTO>> listItemsOfMine(TokenDto userDetail, ItemOfMineFormDTO formDTO) {
+        if (null == userDetail || null == userDetail.getGridId() || StringUtils.isEmpty(userDetail.getUserId())) {
+            return new Result<List<ItemResultDTO>>().error("获取用户信息失败");
+        }
+        formDTO.setDeptId(userDetail.getGridId());
+        formDTO.setUserId(userDetail.getUserId());
+        return itemFeignClient.listItemsOfMine(formDTO);
+    }
 }

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

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

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

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 我的项目
+ * @Author LC
+ * @Date 2019/9/17 13:23
+ */
+@Data
+public class ItemOfMineFormDTO implements Serializable {
+    private static final long serialVersionUID = 4909843726873904544L;
+
+    /**
+     * 用户所属网格ID
+     */
+    @NotNull(message = "用户网格ID不能为空")
+    private Long deptId;
+    /**
+     * 用户ID
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private int pageIndex;
+    /**
+     * 页容量，默认20页
+     */
+    @Min(value = 1, message = "每页条数必须大于必须大于0")
+    private int pageSize = 20;
+}

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

@@ -3,10 +3,7 @@ package com.elink.esua.epdc.modules.item.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.item.form.ItemCategoryStatisticsFormDTO;
-import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO;
-import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
+import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
@@ -85,4 +82,17 @@ public class EpdcAppItemController {
         List<ItemHandleProgressResultDTO> data = this.itemService.listOfItemHandleProgress(itemId, 1);
         return new Result<List<ItemHandleProgressResultDTO>>().ok(data);
     }
+
+    /**
+     * 我的项目列表
+     * @Params: [formDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 13:35
+     */
+    @GetMapping("listByUserId")
+    public Result<List<ItemResultDTO>> listItemsOfMine(@RequestBody ItemOfMineFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return this.itemService.listItemsOfMine(formDTO);
+    }
 }

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

@@ -199,4 +199,13 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Date: 2019/9/7 10:22
      */
     Result modifyCommentById(String[] commentIds);
+
+    /**
+     * 我的项目列表
+     * @Params: [formDTO]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 13:37
+     */
+    Result<List<ItemResultDTO>> listItemsOfMine(ItemOfMineFormDTO formDTO);
 }

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

@@ -161,7 +161,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         // 查询半年内的数据
         formDto.setSomeMonthsAgo(DateUtils.addDateMonths(new Date(), -6));
         List<ItemResultDTO> data = baseDao.selectListOfItems(formDto);
-        return new Result().ok(data);
+        return new Result<List<ItemResultDTO>>().ok(data);
     }
 
     @Override
@@ -472,4 +472,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result modifyCommentById(String[] commentIds) {
         return issueService.modifyCommentById(commentIds);
     }
+
+    @Override
+    public Result<List<ItemResultDTO>> listItemsOfMine(ItemOfMineFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        ItemFormDTO formDto = new ItemFormDTO();
+        formDto.setDeptId(formDTO.getDeptId());
+        formDto.setPageIndex(pageIndex);
+        formDto.setPageSize(formDTO.getPageSize());
+        formDto.setUserId(formDTO.getUserId());
+        List<ItemResultDTO> data = baseDao.selectListOfItems(formDto);
+        return new Result<List<ItemResultDTO>>().ok(data);
+    }
 }

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

@@ -47,19 +47,12 @@
         hp.CREATED_TIME AS handleTime,
         hp.ADVICE
         CASE
-
-        WHEN (
-        item.ITEM_STATE = 0
-        OR item.ITEM_STATE = 5
-        OR item.ITEM_STATE = 10
-        OR item.ITEM_STATE = 15
-        OR item.ITEM_STATE = 20
-        OR item.ITEM_STATE = 25
-        ) THEN
+        item.ITEM_STATE
+        WHEN 0 THEN
         '处理中'
-        WHEN item.ITEM_STATE = 30 THEN
+        WHEN 5 THEN
         '已关闭'
-        WHEN item.ITEM_STATE = 35 THEN
+        WHEN 10 THEN
         '已结案' ELSE ''
         END
         ) AS stateName
@@ -86,14 +79,21 @@
                 AND t2.DEL_FLAG = '0'
                 WHERE t1.DEL_FLAG = '0'
                 AND t1.GRID_ID = #{deptId}
-                <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
-                <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+                <if test='someMonthsAgo != null and someMonthsAgo != ""'>
+                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
+                </if>
+                <if test='timestamp != null and timestamp != ""'>
+                    <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+                </if>
                 <if test='searchContent != null and searchContent != ""'>
                     AND t1.ITEM_CONTENT LIKE CONCAT('%',#{searchContent},'%')
                 </if>
                 <if test='categoryId != null and categoryId != ""'>
                     AND t1.ISSUE_CATEGORY_ID = #{categoryId}
                 </if>
+                <if test='userId != null and userId != ""'>
+                    AND t1.USER_ID = #{userId}
+                </if>
                 ORDER BY
                 t1.CREATED_TIME DESC
                 LIMIT #{pageIndex},#{pageSize}