diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index b77349f..b83cf07 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -35,21 +35,6 @@ public class ApiWorkUserController { @Autowired private WorkUserService workUserService; - /** - * 工作端-核销记录 - * - * @param formDto 表单 - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author Liuchuang - * @since 2021/1/19 17:00 - */ - @GetMapping("verificationlogs") - public Result verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - - return workUserService.listOfVerificationLogs(formDto); - } - /** * 工作端-获取token * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index 06c8f7b..b5f66f2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java @@ -21,16 +21,6 @@ import java.util.List; */ public interface WorkUserService { - /** - * 工作端-核销记录 - * - * @param formDto 表单 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author Liuchuang - * @since 2021/1/19 17:41 - */ - Result listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto); - /** * 工作端-获取token * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java index f49482f..49b4e4c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.service.impl; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsVerificationCheckFormDTO; @@ -15,6 +16,7 @@ import com.elink.esua.epdc.modules.points.feign.PointsFeignClient; import com.elink.esua.epdc.modules.points.feign.WorkPointsFeignClient; import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO; import com.elink.esua.epdc.service.UserPointsVerificationService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +29,7 @@ import java.util.List; * @since 2021/1/19 10:49 */ @Service +@Slf4j public class UserPointsVerificationServiceImpl implements UserPointsVerificationService { @Autowired diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index a0137b8..39fa378 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -70,14 +70,6 @@ public class WorkUserServiceImpl implements WorkUserService { @Autowired private WorkItemService workItemService; - @Autowired - private WorkPointsFeignClient workPointsFeignClient; - @Override - public Result listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto) { - log.info("+++++++++++++++++++++SecurityUser.getDeptId():"+ SecurityUser.getDeptId()); - return workPointsFeignClient.verificationLogs(formDto); - } - @Override public Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) { // 获取openId diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 492bcbd..c8919c0 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 492bcbd6a6d79fd19c7e1cd924d6a4a958cbee7c +Subproject commit c8919c0138cc614ccd30b1d50cde3aa0012ec084