未符合项bug修复 --->新增支持查询责任部门

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java

@@ -56,7 +56,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
         List<SarStandardsInfo> list1 = userIPage1.getRecords();
 
         QueryWrapper<SarStandUnqualified> wrapper = new QueryWrapper<>();
-//        wrapper1.like("stand_number",null);
         wrapper.select("STAND_SERIAL_NUMBER");
         Page<SarStandUnqualified> page = new Page<>();
         IPage<SarStandUnqualified> userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper);
@@ -68,26 +67,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
             }
         }
 
-//        QueryWrapper<SarStandUnqualified> 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<SarStandUnqualified> standUnqualifiedPage=new Page<>();
         //判断前端是否提供页码和每页条数
         List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);

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.* ,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)
-            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
             <if test="sar.standId != null and sar.standId != '' ">
-                and STAND_ID = #{standId}
+                and sar_stand_unqualified.STAND_ID = #{standId}
             </if>
             <if test="sar.productName != null and sar.productName != '' ">
-                and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+                and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
             </if>
             <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
-                and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+                and ts_institution.name like concat('%',#{sar.responsibleUnit},'%')
             </if>
             <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-                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}),'%'))
             </if>
         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
     </select>