diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java index 377b08c0f..3291e40b5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java +++ b/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 itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable Long deptId) { - return workItemService.getItemStatistics(userDetail, deptId); + @GetMapping("statistics") + public Result itemCategoryStatistics(ItemStatisticsFormDTO formDto) { + return workItemService.getItemStatistics(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java index 8093358e8..38e9a8455 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java +++ b/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 getItemStatistics(TokenDto userDetail, Long deptId); + Result getItemStatistics(ItemStatisticsFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java index d88445bbc..b4c82f146 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java +++ b/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 getItemStatistics(TokenDto userDetail, Long deptId) { - if (null == userDetail) { - return new Result().error("获取用户信息失败"); - } - ItemStatisticsFormDTO formDto = new ItemStatisticsFormDTO(); - formDto.setDeptId(deptId); + public Result getItemStatistics(ItemStatisticsFormDTO formDto) { return workItemFeignClient.itemStatistics(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java index e4853d191..e229b167c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java +++ b/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 deptIdList; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/workItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/workItemController.java index 51bb3faf8..ed7b74339 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/workItemController.java +++ b/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 itemStatistics(@RequestBody ItemStatisticsFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); return this.itemService.getItemStatistics(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 566de9632..6a2fb3e40 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem } @Override public Result getItemStatistics(ItemStatisticsFormDTO formDto) { + ItemStatisticsResultDTO resultDTO = baseDao.selectOneItemStatistics(formDto); return new Result().ok(resultDTO); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 520954d6f..7572059ab 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/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' - AND dept.DEPT_ID IN - + #{deptId} - + AND dept.DEPT_ID = #{formDto.deptId} @@ -613,12 +612,10 @@ WHERE item.DEL_FLAG = '0' AND item.ITEM_STATE = '10' - AND dept.DEPT_ID IN - + #{deptId} - AND dept.DEPT_ID = #{formDto.deptId} @@ -634,12 +631,11 @@ WHERE item.DEL_FLAG = '0' AND item.ITEM_STATE = '5' - + AND dept.DEPT_ID IN - + #{deptId} - AND dept.DEPT_ID = #{formDto.deptId}