From aac230b48ee7a70a14ce94a2be2f6924995af629 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Tue, 28 Mar 2023 14:22:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B8=97=E9=80=8F=E6=A3=80=E6=B5=8B-?= =?UTF-8?q?=E5=A7=94=E6=89=98=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E8=A7=92=E8=89=B2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectEntrustServiceImpl.java | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index bfc6f77..316f7df 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -112,16 +112,35 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl Date: Wed, 29 Mar 2023 09:26:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B8=97=E9=80=8F=E6=A3=80=E6=B5=8B-?= =?UTF-8?q?=E5=A7=94=E6=89=98=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E8=A7=92=E8=89=B2=E7=BC=96=E5=8F=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectEntrustController.java | 8 ++++++-- .../projectentrust/service/IProjectEntrustService.java | 2 +- .../service/impl/ProjectEntrustServiceImpl.java | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java index dacc602..affce51 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java @@ -19,6 +19,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.Inq import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -33,6 +34,7 @@ import java.util.List; * @date 2029/10/23 * @version 1.0 */ +@Slf4j @RestController @Api(tags = "项目委托表") @RequestMapping("/v1/projectEntrust") @@ -102,9 +104,11 @@ public class ProjectEntrustController{ @ApiOperation("查询分页数据") @PostMapping("/getPage") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-sub-admin','ebtp-agency-admin','ebtp-agency-project-manager')") - public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust){ + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust, + @RequestHeader(name = "currentRoleCode", required = false) String currentRoleCode){ - return BaseResponse.success(projectEntrustService.getPage(projectEntrust)); + log.info("查询分页数据 currentRoleCode:"+currentRoleCode); + return BaseResponse.success(projectEntrustService.getPage(projectEntrust,currentRoleCode)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java index ed4b031..7c8b0e1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java @@ -22,7 +22,7 @@ public interface IProjectEntrustService extends IBaseService{ * @param projectEntrust 委托单查询信息 * @return 返回结果 */ - IPage getPage(ProjectEntrustVO projectEntrust); + IPage getPage(ProjectEntrustVO projectEntrust,String currentRoleCode); /** * 分派项目经理 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index 316f7df..d6a6a7e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -105,14 +105,14 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust) { + private QueryWrapper getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust,String currentRoleCode) { QueryWrapper query = new QueryWrapper<>(); //项目名称 if(StringUtils.isNotBlank(projectEntrust.getProjectName())){ query.like("project_name", projectEntrust.getProjectName()); } - - String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode(); + log.info("查询分页数据 currentRoleCode2:"+cacheUserService.getCacheUser().getCurrentRoleCode()); + //String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode(); //采购经理查 采购经理 if("ebtp-purchase".equals(currentRoleCode)){ @@ -166,9 +166,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getPage(ProjectEntrustVO projectEntrust) { + public IPage getPage(ProjectEntrustVO projectEntrust,String currentRoleCode) { - QueryWrapper query = getProjectEntrustQueryWrapper(projectEntrust); + QueryWrapper query = getProjectEntrustQueryWrapper(projectEntrust,currentRoleCode); query.orderByDesc("id"); From 35c6fdc2825a7617d703b4b1e9a1ca0437608d65 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 29 Mar 2023 09:48:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B8=97=E9=80=8F=E6=A3=80=E6=B5=8B-?= =?UTF-8?q?=E5=A7=94=E6=89=98=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E8=A7=92=E8=89=B2=E7=BC=96=E5=8F=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectEntrustController.java | 6 ++---- .../service/IProjectEntrustService.java | 2 +- .../service/impl/ProjectEntrustServiceImpl.java | 12 +++++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java index affce51..61a5baa 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java @@ -104,11 +104,9 @@ public class ProjectEntrustController{ @ApiOperation("查询分页数据") @PostMapping("/getPage") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-sub-admin','ebtp-agency-admin','ebtp-agency-project-manager')") - public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust, - @RequestHeader(name = "currentRoleCode", required = false) String currentRoleCode){ + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust){ - log.info("查询分页数据 currentRoleCode:"+currentRoleCode); - return BaseResponse.success(projectEntrustService.getPage(projectEntrust,currentRoleCode)); + return BaseResponse.success(projectEntrustService.getPage(projectEntrust)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java index 7c8b0e1..ed4b031 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java @@ -22,7 +22,7 @@ public interface IProjectEntrustService extends IBaseService{ * @param projectEntrust 委托单查询信息 * @return 返回结果 */ - IPage getPage(ProjectEntrustVO projectEntrust,String currentRoleCode); + IPage getPage(ProjectEntrustVO projectEntrust); /** * 分派项目经理 diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index d6a6a7e..eea70c0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -105,13 +105,15 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust,String currentRoleCode) { + private QueryWrapper getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust) { QueryWrapper query = new QueryWrapper<>(); //项目名称 if(StringUtils.isNotBlank(projectEntrust.getProjectName())){ query.like("project_name", projectEntrust.getProjectName()); } - log.info("查询分页数据 currentRoleCode2:"+cacheUserService.getCacheUser().getCurrentRoleCode()); + + String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode(); + log.info("查询分页数据 currentRoleCode2:"+currentRoleCode); //String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode(); //采购经理查 采购经理 @@ -123,7 +125,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getPage(ProjectEntrustVO projectEntrust,String currentRoleCode) { + public IPage getPage(ProjectEntrustVO projectEntrust) { - QueryWrapper query = getProjectEntrustQueryWrapper(projectEntrust,currentRoleCode); + QueryWrapper query = getProjectEntrustQueryWrapper(projectEntrust); query.orderByDesc("id"); From f62e79d0dd845b24bcd8581f0dc5f0e5d95ee5c6 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 29 Mar 2023 10:00:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B8=97=E9=80=8F=E6=A3=80=E6=B5=8B-?= =?UTF-8?q?=E5=A7=94=E6=89=98=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E8=A7=92=E8=89=B2=E7=BC=96=E5=8F=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectEntrustServiceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java index eea70c0..ad96404 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java @@ -119,14 +119,12 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl