From 87f3c15a7b425c9f7a54e177ef03286bebafd260 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 25 Aug 2021 17:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=A1=B9=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=8A=A0standType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SarStandUnqualifiedDao.java | 5 ++ .../entity/SarStandUnqualified.java | 4 ++ .../impl/SarStandUnqualifiedServiceImpl.java | 54 ++++++++++--------- .../impl/SarFileSplitItemsEOServiceImpl.java | 13 +++++ .../SarStandUnqualifiedMapper.xml | 46 ++++++++++++++++ 5 files changed, 96 insertions(+), 26 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index 5d7791d0..c456d737 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** *

* Mapper 接口 @@ -20,5 +22,8 @@ import org.apache.ibatis.annotations.Mapper; public interface SarStandUnqualifiedDao extends BaseMapper { IPage getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + List getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified); + + Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index d6e29253..9f5e772e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -166,5 +166,9 @@ public class SarStandUnqualified extends BaseEntity { @TableField(exist=false) private String dutyEngineerName; + @ApiModelProperty(value = "国内OR海外") + @TableField(exist=false) + private String standType; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 599e5517..aaaff4f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -47,7 +47,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper wrapper1 = new QueryWrapper<>(); - wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR"); + wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_TYPE"); wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'"); Page page1 = new Page<>(); IPage userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1); @@ -66,33 +66,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); - } - //仅查询未关闭的 - sarStandUnqualifiedQueryWrapper.eq("close_state",1); - //根据 项目名称 进行查询 - if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); - } - //根据 责任部门 进行查询 - if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ - sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); - } - //根据 标准号/标准名称 进行查询 - if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ -// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); - sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + - "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); - } +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// if(sarStandUnqualifiedPage.getStandId()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); +// } +// //仅查询未关闭的 +// sarStandUnqualifiedQueryWrapper.eq("close_state",1); +// //根据 项目名称 进行查询 +// if(sarStandUnqualifiedPage.getProductName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); +// } +// //根据 责任部门 进行查询 +// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); +// } +// //根据 标准号/标准名称 进行查询 +// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ +//// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); +// sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + +// "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); +// } Page standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null - && sarStandUnqualifiedPage.getSize()!=null){ - standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); + List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); + Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); + standUnqualifiedPage.setRecords(sarStandUnqualifieds); + standUnqualifiedPage.setTotal(total); + standUnqualifiedPage.setCurrent(sarStandUnqualifiedPage.getCurrent()); + standUnqualifiedPage.setSize(sarStandUnqualifiedPage.getSize()); + return standUnqualifiedPage; } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 06d92dfa..8080938d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -74,23 +74,36 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic @Override public Map getByPage(SarFileSplitItemsEOPage page) { + //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效 page.setValidFlag("0"); + //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列 page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); + //如果SAR_FILE_SPLIT_ITEMS表里的拆分目录ID即MenuId不为空 if (com.adc.da.util.utils.StringUtils.isNotEmpty(page.getMenuId())) { + //把根据条件查询SAR_FILE_SPLIT_MENU表查出来的数据放到sarFileSplitMenuEOList里 List sarFileSplitMenuEOList = sarFileSplitMenuEOService.queryByList(new SarFileSplitMenuEOPage()); + //把这个sarFileSplitMenuEOList转换成树的形式 Tree tree = new Tree<>(sarFileSplitMenuEOList); + //treeNode就是树的子节点中的SAR_FILE_SPLIT_ITEMS表中的menuId TreeNode treeNode = tree.getTreeNode(page.getMenuId()); List menuIds = new ArrayList<>(); + //然后把刚刚的treeNode的nodeId放到menuIds数组里 menuIds.add(treeNode.getNodeId()); for (TreeNode node : treeNode.getAllChildren()) { + //把所有的treeNode的nodeId放到menuIds数组里 menuIds.add(node.getNodeId()); } + //把它放到MenuIdList里 page.setMenuIdList(menuIds); } + //数出SAR_FILE_SPLIT_ITEMS这个表里MENU_ID不为空或id不为空的记录一共有几条（基本上就是数出这个表一共有几条数据） int count = dao.queryByCount(page); + //把page里的值当做条件一顿左联查询了SAR_FILE_SPLIT_ITEMS这个表 List rows = dao.queryByPage(page); + //如果查询出来的结果不为空 if (rows != null && !rows.isEmpty()) { + //遍历rows for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { //查询svpps String svppsShow = sysInfoEOService.getSvppsNamesByIds(sarFileSplitItemsEO.getSvpps()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index da1eb9a9..117b6e2c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -29,4 +29,50 @@ and a.stand_id = #{standId} + + + + +