项目统计接口+未认证用户接口

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 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.ItemStatisticsFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
 import com.elink.esua.epdc.service.WorkItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +31,9 @@ public class ApiWorkItemController {
      * @Author: liuchuang
      * @Date: 2019/9/12 13:26
      */
-    @GetMapping("statistics/{deptId}")
-    public Result<ItemStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable Long deptId) {
-        return workItemService.getItemStatistics(userDetail, deptId);
+    @GetMapping("statistics")
+    public Result<ItemStatisticsResultDTO> itemCategoryStatistics(ItemStatisticsFormDTO formDto) {
+        return workItemService.getItemStatistics(formDto);
     }
 
 }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 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.ItemStatisticsFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
 
@@ -19,5 +20,5 @@ public interface WorkItemService {
      * @Author: lipengfei
      * @Date: 2019/11/18 13:27
      */
-    Result<ItemStatisticsResultDTO> getItemStatistics(TokenDto userDetail, Long deptId);
+    Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto);
 }

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

@@ -31,12 +31,7 @@ public class WorkItemServiceImpl implements WorkItemService {
      * @Date: 2019/11/18 13:27
      */
     @Override
-    public Result<ItemStatisticsResultDTO> getItemStatistics(TokenDto userDetail, Long deptId) {
-        if (null == userDetail) {
-            return new Result<ItemStatisticsResultDTO>().error("获取用户信息失败");
-        }
-        ItemStatisticsFormDTO formDto = new ItemStatisticsFormDTO();
-        formDto.setDeptId(deptId);
+    public Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto) {
         return workItemFeignClient.itemStatistics(formDto);
     }
 

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

@@ -23,7 +23,6 @@ public class ItemStatisticsFormDTO implements Serializable {
     /**
      * 部门ID列表
      */
-    @NotNull(message = "部门ID列表不能为空")
     List<Long> deptIdList;
 
 }

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

@@ -34,7 +34,6 @@ public class workItemController {
      */
     @GetMapping("statistics")
     public Result<ItemStatisticsResultDTO> itemStatistics(@RequestBody ItemStatisticsFormDTO formDto) {
-        ValidatorUtils.validateEntity(formDto);
         formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList());
         return this.itemService.getItemStatistics(formDto);
     }

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

@@ -620,6 +620,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
     @Override
     public Result<ItemStatisticsResultDTO> getItemStatistics(ItemStatisticsFormDTO formDto) {
+
         ItemStatisticsResultDTO resultDTO = baseDao.selectOneItemStatistics(formDto);
         return new Result<ItemStatisticsResultDTO>().ok(resultDTO);
     }

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

@@ -591,12 +591,11 @@
            WHERE
 	           item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '0'
-        <if test="deptIdList != null">
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-        </if>
+
         <if test='formDto.deptId != null and formDto.deptId != ""'>
             AND dept.DEPT_ID = #{formDto.deptId}
         </if>
@@ -613,12 +612,10 @@
            WHERE
 	           item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '10'
-        <if test="deptIdList != null">
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-        </if>
         <if test='formDto.deptId != null and formDto.deptId != ""'>
             AND dept.DEPT_ID = #{formDto.deptId}
         </if>
@@ -634,12 +631,11 @@
            WHERE
            item.DEL_FLAG = '0'
 	           AND item.ITEM_STATE = '5'
-        <if test="deptIdList != null">
+
             AND dept.DEPT_ID IN
-            <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+            <foreach item="deptId" collection="formDto.deptIdList" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-        </if>
         <if test='formDto.deptId != null and formDto.deptId != ""'>
             AND dept.DEPT_ID = #{formDto.deptId}
         </if>