From 71f81bf84706f20c04f6a11ef43f538b3c4d0e6e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 15 May 2020 14:21:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetUserFeignClient.java | 12 +++++++ .../EpmetUserFeignClientFallBack.java | 6 ++++ .../service/impl/ProjectServiceImpl.java | 12 +++++-- .../src/main/resources/mapper/ProjectDao.xml | 32 ++++++++++++++++--- 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index bf4458e68b..4905c95282 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.StaffInfoResultDTO; @@ -36,4 +37,15 @@ public interface EpmetUserFeignClient { */ @PostMapping("/epmetuser/customerstaff/stafflist") Result> getStaffList(@RequestBody StaffsInAgencyFromDTO fromDTO); + + /** + * 根据用户ID获取工作人员基本信息 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author zhaoqifeng + * @date 2020/4/22 10:05 + **/ + @PostMapping(value = "epmetuser/customerstaff/getstaffinfobyuserid") + Result getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java index 94a52d75f0..aa37f59e4b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java @@ -3,6 +3,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.StaffInfoResultDTO; @@ -28,4 +29,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result> getStaffList(StaffsInAgencyFromDTO fromDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffList", fromDTO); } + + @Override + public Result getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "CustomerStaffDTO", formDTO); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index d4ea02b1b1..b31106a853 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.constant.ParameterKeyConstant; import com.epmet.constant.ProjectConstant; import com.epmet.dao.ProjectDao; import com.epmet.dto.CustomerProjectParameterDTO; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.IssueDTO; import com.epmet.dto.ProjectDTO; import com.epmet.dto.ProjectStaffDTO; @@ -38,6 +39,7 @@ import com.epmet.entity.ProjectEntity; import com.epmet.entity.ProjectProcessEntity; import com.epmet.entity.ProjectStaffEntity; import com.epmet.feign.CommonFeignClient; +import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.ProjectRedis; import com.epmet.service.CustomerProjectParameterService; @@ -73,6 +75,8 @@ public class ProjectServiceImpl extends BaseServiceImpl projectList = baseDao.selectCreatedList(fromDTO); + List projectList = baseDao.selectInvolvedList(fromDTO); //获取客户定制的可滞留天数 Integer finalDays = getDays(fromDTO); projectList.forEach(p -> { @@ -352,9 +356,12 @@ public class ProjectServiceImpl extends BaseServiceImpl> detentionDays = commonFeignClient.detentionDays(list); return detentionDays.getData().get(0).getDetentionDays(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 492465f853..242e6fdfc5 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -68,10 +68,22 @@ FROM project_staff WHERE DEL_FLAG = '0' - AND IS_HANDLE = 'unhandled' + AND IS_HANDLE = 'handle' GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close' - WHERE p.DEL_FLAG = '0' + WHERE + NOT EXISTS ( + SELECT + PROJECT_ID + FROM + project_staff + WHERE + DEL_FLAG = '0' + AND PROJECT_ID = p.ID + AND STAFF_ID = #{userId} + AND IS_HANDLE = 'unhandled' + ) + AND p.DEL_FLAG = '0' ORDER BY p.CREATED_TIME ASC LIMIT #{pageNo}, #{pageSize} @@ -102,10 +114,22 @@ FROM project_staff WHERE DEL_FLAG = '0' - AND IS_HANDLE = 'unhandled' + AND IS_HANDLE = 'handle' GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close' - WHERE p.DEL_FLAG = '0' + WHERE + NOT EXISTS ( + SELECT + PROJECT_ID + FROM + project_staff + WHERE + DEL_FLAG = '0' + AND PROJECT_ID = p.ID + AND STAFF_ID = #{userId} + AND IS_HANDLE = 'unhandled' + ) + AND p.DEL_FLAG = '0' ORDER BY p.CREATED_TIME ASC LIMIT #{pageNo}, #{pageSize}