From b5ce09beb38e05832bdbcbe3885d3baad756c425 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 19 Nov 2019 09:36:13 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/EpdcAppUserController.java | 4 ++-- .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 7f906cc4c..c2b9dfe40 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -266,8 +266,8 @@ public class EpdcAppUserController { * @param userId * @return */ - @GetMapping("partyMemberDetail") - public Result partyMemberDetail(String userId){ + @GetMapping("partyMemberDetail/{userId}") + public Result partyMemberDetail(@PathVariable("userId") String userId){ return userService.partyMemberDetail(userId); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 47e93aaf5..85c656293 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -168,7 +168,7 @@ - + @@ -207,7 +207,7 @@ AND eptr.DEL_FLAG = '0' AND eu.ID = #{userId} - + - + @@ -99,7 +107,7 @@ - + @@ -127,53 +135,53 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -250,4 +258,28 @@ AND eu.id = #{userId} + From 488d0d9b215d46e7dc138bd44999448b49ac0beb Mon Sep 17 00:00:00 2001 From: gupeng Date: Tue, 19 Nov 2019 10:19:02 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/feign/UserFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index d87b4c362..b6edf33f5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -273,6 +273,6 @@ public interface UserFeignClient { * @param userId * @return */ - @GetMapping("app-user/epdc-app/user/partyMemberDetail") - Result partyMemberDetail(String userId); + @GetMapping("app-user/epdc-app/user/partyMemberDetail/{userId}") + Result partyMemberDetail(@PathVariable("userId") String userId); } From 74e6389175b635bb6ec7192013ba19ed07b5b756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 19 Nov 2019 10:08:15 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E6=9C=AA=E8=AE=A4=E8=AF=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkItemController.java | 38 +++++ .../esua/epdc/feign/WorkItemFeignClient.java | 37 +++++ .../fallback/WorkItemFeignClientFallback.java | 29 ++++ .../esua/epdc/service/WorkItemService.java | 23 +++ .../service/impl/WorkItemServiceImpl.java | 43 +++++ .../dto/item/form/ItemStatisticsFormDTO.java | 29 ++++ .../item/result/ItemStatisticsResultDTO.java | 28 ++++ .../item/controller/workItemController.java | 41 +++++ .../esua/epdc/modules/item/dao/ItemDao.java | 12 ++ .../modules/item/service/ItemService.java | 9 + .../item/service/impl/ItemServiceImpl.java | 5 + .../main/resources/mapper/item/ItemDao.xml | 87 ++++++++++ .../java/com/elink/esua/epdc/dto/UserDTO.java | 4 + .../esua/epdc/controller/UserController.java | 2 + .../src/main/resources/mapper/UserDao.xml | 156 +++++++----------- 15 files changed, 449 insertions(+), 94 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/workItemController.java 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 new file mode 100644 index 000000000..377b08c0f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java @@ -0,0 +1,38 @@ +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.result.ItemStatisticsResultDTO; +import com.elink.esua.epdc.service.WorkItemService; +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; + +/** + * 移动端接口-项目模块 + * @Author LPF + * @Date 2019/11/18 13:32 + */ +@RestController +@RequestMapping("work/event/item") +public class ApiWorkItemController { + + @Autowired + private WorkItemService workItemService; + + /** + * 项目分类统计 + * @Params: [userDetail, categoryId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @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); + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java new file mode 100644 index 000000000..236fcefae --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java @@ -0,0 +1,37 @@ +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.*; +import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.WorkItemFeignClientFallback; +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.PostMapping; + +import java.util.List; + +/** + * 项目模块调用-移动app端 + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class,url ="http://127.0.0.1:9066") +public interface WorkItemFeignClient { + + + + /** + * 项目统计 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/18 13:29 + */ + @GetMapping(value = "events/work/item/statistics", consumes = MediaType.APPLICATION_JSON_VALUE) + Result itemStatistics(ItemStatisticsFormDTO formDto); + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java new file mode 100644 index 000000000..498f0bd9f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java @@ -0,0 +1,29 @@ +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.*; +import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.feign.WorkItemFeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +/** + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@Component +public class WorkItemFeignClientFallback implements WorkItemFeignClient { + + + + @Override + public Result itemStatistics(ItemStatisticsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemStatistics", 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 new file mode 100644 index 000000000..8093358e8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java @@ -0,0 +1,23 @@ +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.result.ItemCategoryStatisticsResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO; + +/** + * 项目模块-移动App端 + * @Author LPF + * @Date 2019/11/18 13:34 + */ +public interface WorkItemService { + + /** + * 项目统计 + * @Params: [userDetail, deptId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/18 13:27 + */ + Result getItemStatistics(TokenDto userDetail, Long deptId); +} 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 new file mode 100644 index 000000000..d88445bbc --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java @@ -0,0 +1,43 @@ +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.*; +import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.feign.WorkItemFeignClient; +import com.elink.esua.epdc.service.WorkItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目模块-移动app端 + * @Author LPF + * @Date 2019/11/18 16:34 + */ +@Service +public class WorkItemServiceImpl implements WorkItemService { + + @Autowired + private WorkItemFeignClient workItemFeignClient; + + /** + * 项目统计 + * @Params: [userDetail, selectedId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @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); + 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 new file mode 100644 index 000000000..e4853d191 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemStatisticsFormDTO.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * 项目统计表单DTO + * @Author LPF + * @Date 2019/11/18 13:21 + */ +@Data +public class ItemStatisticsFormDTO implements Serializable { + private static final long serialVersionUID = 2999035593195412516L; + + /** + * 部门ID + */ + private Long deptId; + /** + * 部门ID列表 + */ + @NotNull(message = "部门ID列表不能为空") + List deptIdList; + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java new file mode 100644 index 000000000..3dfe7cdcf --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemStatisticsResultDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 项目统计DTO + * @Author LPF + * @Date 2019/11/18 13:22 + */ +@Data +public class ItemStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = 1156180616337484819L; + /** + * 待处理数量 + */ + private String pendingHandleNum; + /** + * 已结案数量 + */ + private String closingCaseNum; + /** + * 已关闭数量 + */ + private String closedNum; + +} 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 new file mode 100644 index 000000000..51bb3faf8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/workItemController.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.modules.item.controller; + +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +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.*; +import com.elink.esua.epdc.dto.item.result.*; +import com.elink.esua.epdc.modules.item.service.ItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 移动端-项目表 + * @Author LC + * @Date 2019/9/9 16:44 + */ +@RestController +@RequestMapping("work/item") +public class workItemController { + + @Autowired + private ItemService itemService; + + + /** + * 项目分类统计 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/12 13:31 + */ + @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/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 6f96bfa31..dd09be3ad 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; 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.ItemStatisticsFormDTO; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import org.apache.ibatis.annotations.Mapper; @@ -87,6 +88,8 @@ public interface ItemDao extends BaseDao { */ ItemCategoryStatisticsResultDTO selectOneItemCategoryStatistics(ItemCategoryStatisticsFormDTO formDTO); + + /** * PC端项目列表 * @Params: [params] @@ -145,4 +148,13 @@ public interface ItemDao extends BaseDao { */ int selectCountOfItemWhistlingDeptNotice(Long deptId); + /** + * 移动端-项目统计 + * @Params: [formDTO] + * @Return: com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO + * @Author: lipengfei + * @Date: 2019/11/18 13:37 + */ + ItemStatisticsResultDTO selectOneItemStatistics(ItemStatisticsFormDTO formDTO); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 0aac60bbf..10888021e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -230,4 +230,13 @@ public interface ItemService extends BaseService { * @since 2019/10/30 12:26 */ void sendWhistlingDeptItemHandleMenuNotice(List deptIds, Long userId); + + /** + * 项目统计 + * @Params: [formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/18 13:32 + */ + Result getItemStatistics(ItemStatisticsFormDTO 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 0a4ebc2b9..566de9632 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 @@ -618,4 +618,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem newsTask.eventMenuNotice(menuNoticeDTO, userId); } } + @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 12b42067f..fb619be94 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 @@ -574,4 +574,91 @@ ) ) + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java index 271040877..8098596e4 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java @@ -308,5 +308,9 @@ public class UserDTO implements Serializable { * 审核备注 */ private String remark; + /** + * 所属网格（街道-社区-网格） + */ + private String myGridName; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 2c7cce5b9..f43fd9e93 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -123,6 +123,8 @@ public class UserController { fileName = "审核通过"; } else if (AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.equals(auditState)) { fileName = "审核未通过"; + }else if (AppUserStatesEnum.STATE_REGISTERED.equals(auditState)) { + fileName = "已注册"; } ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index f30458e1b..85c656293 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -62,43 +62,35 @@ - + @@ -107,7 +99,7 @@ - + @@ -135,53 +127,53 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -258,28 +250,4 @@ AND eu.id = #{userId} - From 0936309ab160c72cb10eae243a4e0c043af46f60 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 19 Nov 2019 10:28:59 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java index 1842fb2a9..31cd785e6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java @@ -61,4 +61,9 @@ public class EpdcCompleteUserInfoDTO implements Serializable { * 审核备注 */ private String remark; + + /** + * 性别 + */ + private String sex; } From fcf47ff50df0362244748c7e300f29308ff8431b Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 19 Nov 2019 10:36:58 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/feign/UserFeignClient.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 8997cca0d..7c235b62f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -273,6 +273,15 @@ public interface UserFeignClient { * @param userId * @return */ - @GetMapping("app-user/epdc-app/user/partyMemberDetail/{userId}") - Result partyMemberDetail(@PathVariable("userId") String userId); + @GetMapping("app-user/epdc-app/user/partyMemberDetail") + Result partyMemberDetail(String userId); + /*** + * 用户列表 + * @param workUserFromDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/11/18 13:47 + */ + @GetMapping("app-user/epdc-app/user/list") + Result> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto); } From 2943dde68b731220baedf9e1b7a50bae5d8b7de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Tue, 19 Nov 2019 10:42:02 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E6=9C=AA=E8=AE=A4=E8=AF=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 16 ---------------- 1 file changed, 16 deletions(-) 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 fb619be94..520954d6f 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 @@ -575,22 +575,6 @@ ) +