diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java index eda8980bfe96021403b4a05f0efa07b158801e61..994b354b78fa6d463ca4aff44c373e61c24f382d 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/service/FlowSvrImpl.java @@ -3,6 +3,7 @@ package com.seasky.projectplan.domain.service; import com.seasky.microflowapi.dto.FlowCanShowOut; import com.seasky.projectplan.infrastructure.rpc.FlowRpc; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * 娴佺▼ svr impl @@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; * @author chenqi * @date 2021/05/27 */ +@Service public class FlowSvrImpl implements FlowSvr { @Autowired FlowRpc flowRpc; diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java index d82cf441fc5ea7e391281d9f27c5869fd9285812..e99724ec47a8c2568da645b29ce11baba6def2a6 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryConvert.java @@ -21,6 +21,12 @@ import java.util.List; */ public class ProjectPlanQueryConvert { + /** + * 椤圭洰缁忚垂鐢虫姤涔o杞琽ut绫� + * + * @param infoDo 淇℃伅鍋� + * @return {@link ProjectPlanBookOut} + */ public static ProjectPlanBookOut infoDoToOut(ProjectInfoPlanDo infoDo){ ProjectPlanBookOut out = MapperUtils.INSTANCE.map(ProjectPlanBookOut.class, infoDo); List<PlanBookSubjectOut> planBookSubjectOuts = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectOut.class, infoDo.getPlanSubjectList()); @@ -30,6 +36,12 @@ public class ProjectPlanQueryConvert { return out; } + /** + * 椤圭洰缁忚垂鐢虫姤涔o杞琽ut绫诲垪琛� + * + * @param infoDos 淇℃伅dos + * @return {@link List<ProjectPlanBookOut>} + */ public static List<ProjectPlanBookOut> infoDoToOutList(List<ProjectInfoPlanDo> infoDos){ ArrayList<ProjectPlanBookOut> outList = new ArrayList<>(); for(ProjectInfoPlanDo infoDo:infoDos){ @@ -39,7 +51,12 @@ public class ProjectPlanQueryConvert { return outList; } - //--------------------------- + /** + * 鏃ュ父缁忚垂鐢虫姤涔o杞琽ut绫� + * + * @param dailyDo 姣忓ぉ鍋� + * @return {@link ProjectPlanBookOut} + */ public static ProjectPlanBookOut dailyDoToOut(ProjectDailyPlanDo dailyDo){ ProjectPlanBookOut out = MapperUtils.INSTANCE.map(ProjectPlanBookOut.class, dailyDo); List<PlanBookSubjectOut> planBookSubjectOuts = MapperUtils.INSTANCE.mapAsList(PlanBookSubjectOut.class, dailyDo.getSubjectDetailList()); @@ -47,6 +64,12 @@ public class ProjectPlanQueryConvert { return out; } + /** + * 鏃ュ父缁忚垂鐢虫姤涔o杞琽ut绫诲垪琛� + * + * @param dailyDos 姣忓ぉ鍋� + * @return {@link List<ProjectPlanBookOut>} + */ public static List<ProjectPlanBookOut> dailyDoToOutList(List<ProjectDailyPlanDo> dailyDos){ ArrayList<ProjectPlanBookOut> outList = new ArrayList<>(); for(ProjectDailyPlanDo dailyDo:dailyDos){ @@ -56,7 +79,12 @@ public class ProjectPlanQueryConvert { return outList; } - //--------------------------- + /** + * 浜哄憳缁忚垂鐢虫姤涔o杞琽ut绫� + * + * @param personDo 浜哄仛鐨� + * @return {@link ProjectPlanBookOut} + */ public static ProjectPlanBookOut personDoToOut(ProjectPersonPlanDo personDo){ ProjectPlanBookOut out = MapperUtils.INSTANCE.map(ProjectPlanBookOut.class, personDo); List<PlanBookPersonSubjectOut> planBookPersonSubjectOuts = MapperUtils.INSTANCE.mapAsList(PlanBookPersonSubjectOut.class, personDo.getPersonSubjectList()); @@ -64,6 +92,12 @@ public class ProjectPlanQueryConvert { return out; } + /** + * 浜哄憳缁忚垂鐢虫姤涔o杞琽ut绫诲垪琛� + * + * @param personDos 浜篸os + * @return {@link List<ProjectPlanBookOut>} + */ public static List<ProjectPlanBookOut> personDoToOutList(List<ProjectPersonPlanDo> personDos){ ArrayList<ProjectPlanBookOut> outList = new ArrayList<>(); for(ProjectPersonPlanDo personDo:personDos){ diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java index 01cf73bb6a77d2b2e73cede6b45f01eecdac21f0..525600229dea3ef07d7f37b7ba83900ab605109d 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java @@ -29,24 +29,48 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook ProjectPlanBookMapper mapper; + /** + * 鏍规嵁ID 鑾峰彇椤圭洰缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�) + * + * @param id id + * @return {@link ProjectPlanBookOut} + */ @Override public ProjectPlanBookOut queryProjectInfoPlanById(Long id) { - ProjectInfoPlanDo ado = mapper.queryProjectInfoPlanById(id); - return ProjectPlanQueryConvert.infoDoToOut(ado); + ProjectInfoPlanDo infoPlanDo = mapper.queryProjectInfoPlanById(id); + return ProjectPlanQueryConvert.infoDoToOut(infoPlanDo); } + /** + * 鏍规嵁ID 鑾峰彇鏃ュ父缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�) + * + * @param id id + * @return {@link ProjectPlanBookOut} + */ @Override public ProjectPlanBookOut queryProjectDailyPlanById(Long id) { - ProjectDailyPlanDo ado = mapper.queryProjectDailyPlanById(id); - return ProjectPlanQueryConvert.dailyDoToOut(ado); + ProjectDailyPlanDo dailyPlanDo = mapper.queryProjectDailyPlanById(id); + return ProjectPlanQueryConvert.dailyDoToOut(dailyPlanDo); } + /** + * 鏍规嵁ID 鑾峰彇浜哄憳缁忚垂鐢虫姤涔︿俊鎭�(鍚祦绋嬬浉鍏充俊鎭�) + * + * @param id id + * @return {@link ProjectPlanBookOut} + */ @Override public ProjectPlanBookOut queryProjectPersonPlanById(Long id) { - ProjectPersonPlanDo ado = mapper.queryProjectPersonPlanById(id); - return ProjectPlanQueryConvert.personDoToOut(ado); + ProjectPersonPlanDo personPlanDo = mapper.queryProjectPersonPlanById(id); + return ProjectPlanQueryConvert.personDoToOut(personPlanDo); } + /** + * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栭」鐩粡璐归泦鍚堬紙鍒嗛〉锛� + * + * @param projectPlanBookQry 椤圭洰璁″垝涔﹀叆鍙俀ry + * @return {@link Pagination<ProjectPlanBookOut>} + */ @Override public Pagination<ProjectPlanBookOut> queryProjectInfoPlanPageByCurrentUserDept(ProjectPlanBookQry projectPlanBookQry) { Page<ProjectPlanBookOut> page = new Page<>(projectPlanBookQry.getPageIndex(), projectPlanBookQry.getPageSize()); @@ -56,6 +80,12 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook return Pagination.fromPage(page); } + /** + * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栨棩甯哥粡璐归泦鍚堬紙鍒嗛〉锛� + * + * @param projectPlanBookQry 椤圭洰璁″垝涔﹀叆鍙俀ry + * @return {@link Pagination<ProjectPlanBookOut>} + */ @Override public Pagination<ProjectPlanBookOut> queryProjectDailyPlanByCurrentUserDept(ProjectPlanBookQry projectPlanBookQry) { Page<ProjectPlanBookOut> page = new Page<>(projectPlanBookQry.getPageIndex(), projectPlanBookQry.getPageSize()); @@ -65,6 +95,12 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook return Pagination.fromPage(page); } + /** + * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栦汉鍛樼粡璐归泦鍚堬紙鍒嗛〉锛� + * + * @param projectPlanBookQry 椤圭洰璁″垝涔﹀叆鍙俀ry + * @return {@link Pagination<ProjectPlanBookOut>} + */ @Override public Pagination<ProjectPlanBookOut> queryProjectPersonPlanByCurrentUserDept(ProjectPlanBookQry projectPlanBookQry) { Page<ProjectPlanBookOut> page = new Page<>(projectPlanBookQry.getPageIndex(), projectPlanBookQry.getPageSize()); @@ -74,6 +110,12 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook return Pagination.fromPage(page); } + /** + * 鏍规嵁椤圭洰绫诲瀷鑾峰彇璇ョ被鍨嬬殑鎵€鏈夐」鐩�(鍒嗛〉) + * + * @param projectPlanBookQry 椤圭洰璁″垝涔﹀叆鍙俀ry + * @return {@link Pagination<ProjectPlanBookOut>} + */ @Override public Pagination<ProjectPlanBookOut> queryProjectInfoPlanPageByProjectType(ProjectPlanBookQry projectPlanBookQry) { Page<ProjectPlanBookOut> page = new Page<>(projectPlanBookQry.getPageIndex(), projectPlanBookQry.getPageSize()); @@ -83,6 +125,12 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook return Pagination.fromPage(page); } + /** + * 鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄧ殑閮ㄩ棬闆嗗悎鎵€鎷ユ湁鐨勯」鐩被鍨嬫墍鏈夐」鐩俊鎭� + * + * @param projectPlanBookQry 椤圭洰璁″垝涔﹀叆鍙俀ry + * @return {@link List<ProjectPlanBookOut>} + */ @Override public List<ProjectPlanBookOut> queryProjectInfoPlanPageByOwnCurrentUserDept(ProjectPlanBookQry projectPlanBookQry) { List<ProjectInfoPlanDo> doList = mapper.queryProjectInfoPlanPageByOwnCurrentUserDept(projectPlanBookQry);