diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index f8a09d75..dfe3556c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -49,6 +49,16 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto); + Map map = new HashMap(); + map.put("Maintenance",MaintenanceList); + return Result.success("200",map); + } /** * * @param id diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index f3e013d9..088c5516 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -22,4 +22,6 @@ public interface SarStandProjectLibraryDao extends BaseMapper list); List selectPages(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); Integer selectCount(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); + List selectPagesWorkFlow(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); + Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index f8179596..56140cad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -8,6 +8,7 @@ import java.util.List; public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); + IPage queryMaintenanceProjectWorkFlow(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); IPage queryProjectManager(int current, int pageSize); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 6097ac73..db421951 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -68,6 +68,35 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProjectWorkFlow(int current, int pageSize, + SarStandProjectLibraryDto sarDto) { + SarStandProjectLibrary sar = new SarStandProjectLibrary(); + sar.setProjectPlatfor(sarDto.getProjectPlatfor()); + sar.setProjectNumber(sarDto.getProjectNumber()); + sar.setProjectName(sarDto.getProjectName()); + sar.setProjectClassification(sarDto.getProjectClassification()); + sar.setProjectStatus(sarDto.getProjectStatus()); + sar.setProjectGroup(sarDto.getProjectGroup()); + sar.setCurrentNode(sarDto.getCurrentNode()); + sar.setProjectLevel(sarDto.getProjectLevel()); + sar.setProjectManager(sarDto.getProjectManager()); + sar.setProductLine(sarDto.getProductLine()); + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (sarDto.getProjectStartDate()!=null){ + sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate())); + } + if (sarDto.getProjectEndDate()!=null){ + sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate())); + } + } catch (ParseException e) { + e.printStackTrace(); + } + int flag=3; + return getSarStandProjectLibraryIPage(current, pageSize, sar,flag); + } + @Override public IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); @@ -260,12 +289,23 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl getSarStandProjectLibraryIPage(int current, int pageSize,SarStandProjectLibrary wrapper,int flag) { Page page = new Page<>(current, pageSize); IPage userIPage = new Page<>(); - List sarStandProjectLibraries=sarStandProjectLibraryDao.selectPages(current,pageSize,wrapper,flag); - Integer count = sarStandProjectLibraryDao.selectCount(wrapper,flag); - userIPage.setCurrent(current); - userIPage.setSize(pageSize); - userIPage.setRecords(sarStandProjectLibraries); - userIPage.setTotal(count); - return userIPage; + if (!"3".equals(flag)) { + List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPages(current, pageSize, wrapper, flag); + Integer count = sarStandProjectLibraryDao.selectCount(wrapper, flag); + userIPage.setCurrent(current); + userIPage.setSize(pageSize); + userIPage.setRecords(sarStandProjectLibraries); + userIPage.setTotal(count); + return userIPage; + }else { + flag=2; + List sarStandProjectLibraries = sarStandProjectLibraryDao.selectPagesWorkFlow(current, pageSize, wrapper, flag); + Integer count = sarStandProjectLibraryDao.selectCountWorkFlow(wrapper, flag); + userIPage.setCurrent(current); + userIPage.setSize(pageSize); + userIPage.setRecords(sarStandProjectLibraries); + userIPage.setTotal(count); + return userIPage; + } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index df518e69..939fb13e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -27,7 +27,7 @@ - SELECT count(sar_stand_project_library.id ) as total FROM @@ -82,7 +82,7 @@ ) - SELECT sar_stand_project_library.*, tu.UNAME as uName @@ -92,10 +92,10 @@ WHERE ( - id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) + id NOT IN ( SELECT project_id FROM sar_stand_project_relation ) - id IN ( SELECT project_id FROM sar_stand_project_relation ) + id IN ( SELECT project_id FROM sar_stand_project_relation ) @@ -138,4 +138,115 @@ ) limit ${(page-1)*size},${page*size} + +