From b33c643622bafd5bc2c145ab294e716867497419 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 24 Dec 2021 09:49:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97-->=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandUnqualifiedServiceImpl.java | 60 +++++++++++-------- .../SarStandUnqualifiedMapper.xml | 14 ++--- 2 files changed, 41 insertions(+), 33 deletions(-) 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 546b7201..c2258498 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 @@ -69,6 +69,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 + sarStandUnqualifiedPage.setCloseState(1); List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); standUnqualifiedPage.setRecords(sarStandUnqualifieds); @@ -85,34 +86,41 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { - QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); +// QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); - if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId()); +// if(sarStandUnqualifiedPage.getStandId()!=null){ +//// sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId()); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); - } - if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ - sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()); - } - if (sarStandUnqualifiedPage.getStandName()!=null){ - sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName()); - } - - //仅查询关闭的 - sarStandUnqualifiedQueryWrapper.eq("close_state",2); - if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); - } - if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ - sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); - } - Page standUnqualifiedPage=new Page<>(); - //判断前端是否提供页码和每页条数 - if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ - standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); - } - return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper); - +// } +// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ +// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()); +// } +// if (sarStandUnqualifiedPage.getStandName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName()); +// } +// +// //仅查询关闭的 +// sarStandUnqualifiedQueryWrapper.eq("close_state",2); +// if(sarStandUnqualifiedPage.getProductName()!=null){ +// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); +// } +// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ +// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); +// } +// Page standUnqualifiedPage=new Page<>(); +// //判断前端是否提供页码和每页条数 +// if(sarStandUnqualifiedPage.getCurrent()!=null&&sarStandUnqualifiedPage.getSize()!=null){ +// standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); +// } + sarStandUnqualifiedPage.setCloseState(2); + List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); + Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage); + Page page=new Page(); + page.setSize(sarStandUnqualifiedPage.getSize()); + page.setCurrent(sarStandUnqualifiedPage.getCurrent()); + page.setTotal(total); + page.setRecords(sarStandUnqualifieds); + return page; } /** 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 91414c6f..1c7c26b9 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 @@ -40,7 +40,7 @@ WHERE close_state = 1 - and STAND_ID = #{standId} + and STAND_ID = #{sar.standId} and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') @@ -61,15 +61,15 @@ c.* FROM ( - SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_institution.name as responsibleUnit FROM + SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as dutyEngineerName , ts_institution.name as responsibleUnit FROM (sar_stand_unqualified,(SELECT @i:=0)j) left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id left join ts_user on ts_user.USID = sar_stand_unqualified.DUTY_ENGINEER left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID WHERE - sar_stand_unqualified.close_state = 1 + sar_stand_unqualified.close_state = #{sar.closeState} - and sar_stand_unqualified.STAND_ID = #{standId} + and sar_stand_unqualified.STAND_ID = #{sar.standId} and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') @@ -81,7 +81,7 @@ and (REPLACE(sar_stand_unqualified.STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) - order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc + order by sar_stand_unqualified.ID,sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} )c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows @@ -119,9 +119,9 @@ SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM sar_stand_unqualified,(SELECT @i:=0)j WHERE - close_state = 1 + close_state = #{sar.closeState} - and STAND_ID = #{standId} + and STAND_ID = #{sar.standId} and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') From 93d6af7d664c72c4934d24078549fc4716cba796 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 24 Dec 2021 09:49:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandUnqualifiedMapper.xml | 46 ------------------- 1 file changed, 46 deletions(-) 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 1c7c26b9..cf9bb389 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 @@ -31,30 +31,6 @@ - -