From 5f5051bd2fe52417b7900a879839723c4d848b37 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 22 Dec 2021 14:03:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20--->=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarStandUnqualifiedServiceImpl.java | 21 ------------------ .../SarStandUnqualifiedMapper.xml | 22 +++++++++---------- 2 files changed, 10 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 1e8c240c..546b7201 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 @@ -56,7 +56,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl list1 = userIPage1.getRecords(); QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper1.like("stand_number",null); wrapper.select("STAND_SERIAL_NUMBER"); Page page = new Page<>(); IPage userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper); @@ -68,26 +67,6 @@ 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()+"%')"); -// } Page standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); 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 8ecf724e..91414c6f 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 @@ -61,30 +61,28 @@ c.* FROM ( - SELECT b.*,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.* FROM - sar_stand_unqualified,(SELECT @i:=0)j + 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 + (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 - close_state = 1 + sar_stand_unqualified.close_state = 1 - and STAND_ID = #{standId} + and sar_stand_unqualified.STAND_ID = #{standId} - and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') + and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') - and RESPONSIBLE_UNIT = #{sar.responsibleUnit} + and ts_institution.name like concat('%',#{sar.responsibleUnit},'%') - and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + 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 limit #{start},#{end} - )b - left join sar_standards_info on b.STAND_ID = sar_standards_info.id - left join ts_user on ts_user.USID = b.DUTY_ENGINEER - left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID )c ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows