From 1b8884fe75eb295c7ea1630af2921266ed659939 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 9 Aug 2021 11:07:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE=E5=BA=93?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandProjectLibraryDao.java | 3 + .../entity/StandAttrInfoDto.java | 2 + .../SarStandProjectLibraryServiceImpl.java | 49 +++----- .../SarStandProjectLibraryMapper.xml | 112 +++++++++++++++++- 4 files changed, 129 insertions(+), 37 deletions(-) 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 93f687c7..f3e013d9 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface SarStandProjectLibraryDao extends BaseMapper queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); void deleteByIds(@Param("ids") List ids); void batchInsert(@Param("list") List 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); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index c07db780..140d8fd6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -27,6 +27,8 @@ public class StandAttrInfoDto { private String standSort; //标准年份 private String standYear; + //标准类型 + private String standType; //中文名称 @ExcelProperty("中文名称") private String standName; 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 510130bc..8284537b 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 @@ -64,21 +64,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.inSql("id", "select project_id from sar_stand_project_relation") - .like(StringUtils.isNotEmpty(sar.getProjectPlatfor()),"project_platfor",sar.getProjectPlatfor()) - .like(StringUtils.isNotEmpty(sar.getProjectNumber()),"project_number",sar.getProjectNumber()) - .like(StringUtils.isNotEmpty(sar.getProjectName()),"project_name",sar.getProjectName()) - .like(StringUtils.isNotEmpty(sar.getProjectGroup()),"project_group",sar.getProjectGroup()) - .like(StringUtils.isNotEmpty(sar.getProjectClassification()),"project_classification",sar.getProjectClassification()) - .like(StringUtils.isNotEmpty(sar.getProjectStatus()),"project_status",sar.getProjectStatus()) - .like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode()) - .like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel()) - .like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager()) - .like(StringUtils.isNotEmpty(sar.getProductLine()),"product_line",sar.getProductLine()) - .ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate()) - .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate()); - return getSarStandProjectLibraryIPage(current, pageSize, wrapper); + int flag=2; + return getSarStandProjectLibraryIPage(current, pageSize, sar,flag); } @Override public IPage queryNotMaintenanceProject(int current, int pageSize, @@ -106,21 +93,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.notInSql("id", "select project_id from sar_stand_project_relation") - .like(StringUtils.isNotEmpty(sar.getProjectPlatfor()),"project_platfor",sar.getProjectPlatfor()) - .like(StringUtils.isNotEmpty(sar.getProjectNumber()),"project_number",sar.getProjectNumber()) - .like(StringUtils.isNotEmpty(sar.getProjectName()),"project_name",sar.getProjectName()) - .like(StringUtils.isNotEmpty(sar.getProjectGroup()),"project_group",sar.getProjectGroup()) - .like(StringUtils.isNotEmpty(sar.getProjectClassification()),"project_classification",sar.getProjectClassification()) - .like(StringUtils.isNotEmpty(sar.getProjectStatus()),"project_status",sar.getProjectStatus()) - .like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode()) - .like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel()) - .like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager()) - .like(StringUtils.isNotEmpty(sar.getProductLine()),"product_line",sar.getProductLine()) - .ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate()) - .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate()); - return getSarStandProjectLibraryIPage(current, pageSize, wrapper); + int flag=1; + return getSarStandProjectLibraryIPage(current, pageSize, sar,flag); } @Override public List queryById(String id) { @@ -158,7 +132,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandInfo(int current, int pageSize, String standId) { QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME"); + wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE"); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='"+ standId+"'"); Page page1 = new Page<>(current, pageSize); IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); @@ -181,6 +155,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) { + private IPage getSarStandProjectLibraryIPage(int current, int pageSize,SarStandProjectLibrary wrapper,int flag) { Page page = new Page<>(current, pageSize); - IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); - System.out.println("总条数"+userIPage.getTotal()); - System.out.println("总页数"+userIPage.getPages()); + 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; } } 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 04ca2f77..9425ee37 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 @@ -9,7 +9,8 @@ - select s.product_line,t.UNAME as uName ,s.project_manager as projectManager from sar_stand_project_library s INNER JOIN ts_user t @@ -21,8 +22,115 @@ delete from sar_stand_project_relation where - ( project_id= #{list.projectId} and stand_id = #{list.standId} ) + ( project_id= #{list.projectId} and stand_id = #{list.standId} ) + + + +