协同任务/分配任务/分页获取对比专利接口查询修改

PAS/src/main/resources/mapper/PatentMapper.xml

@@ -1533,9 +1533,8 @@
             left join os_patent_typeno h on h.pid =a.id and h.type =3
         </if>
         <where>
-
             <choose>
-                <when test="params.projectId != null or (params.patentNos != null and params.patentNos.size()!=0) or (params.importTaskId != null and params.importTaskId.size()!=0)">
+                <when test="params.projectId != null or (params.patentNos != null and params.patentNos.size()!=0) or params.reportId!=null ">
                     <if test="params.projectId != null">
                         and ( a.id in (select pid from os_thematic_pid where zid = #{params.projectId})
                         <if test="params.patentNos != null and params.patentNos.size()!=0">
@@ -1545,49 +1544,31 @@
                                 #{item}
                             </foreach>
                         </if>
-
-                        <if test="params.importTaskId != null and params.importTaskId.size()!=0">
+                        <if test="params.reportId != null">
                             or patentno in
-                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-                            <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                                     close=") ">
-                                #{item}
-                            </foreach>
+                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where REPORT_ID =#{params.reportId}
                             )
                         </if>
-                        )
-
                     </if>
-
                     <if test="params.projectId == null and params.patentNos != null and params.patentNos.size()!=0">
                         (patentno in
                         <foreach item="item" collection="params.patentNos" index="index" open="(" separator=","
                                  close=")">
                             #{item}
                         </foreach>
-                        <if test="params.importTaskId != null and params.importTaskId.size()!=0">
+                        <if test="params.reportId != null">
                             or patentno in
-                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-                            <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                                     close=") ">
-                                #{item}
-                            </foreach>
+                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where REPORT_ID =#{params.reportId}
                             )
                         </if>
                         )
                     </if>
-
-                    <if test="params.projectId == null and (params.patentNos == null or params.patentNos.size()==0) and params.importTaskId != null and params.importTaskId.size()!=0">
+                    <if test="params.projectId == null and (params.patentNos == null or params.patentNos.size()==0) and params.reportId != null">
                         patentno in
-                        ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-                        <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                                 close=") ">
-                            #{item}
-                        </foreach>
+                        ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where REPORT_ID =#{params.reportId}
                         )
                     </if>
 
-
                     <if test="params.notInPatentNos != null and params.notInPatentNos.size!=0">
                         and patentno not in
                         <foreach item="item" collection="params.notInPatentNos" index="index" open="(" separator=","
@@ -1675,7 +1656,7 @@
         </if>
         <where>
             <choose>
-                <when test="params.projectId != null or (params.patentNos != null and params.patentNos.size()!=0) or (params.importTaskId != null and params.importTaskId.size()!=0)">
+                <when test="params.projectId != null or (params.patentNos != null and params.patentNos.size()!=0) or params.reportId!=null ">
                     <if test="params.projectId != null">
                         and ( a.id in (select pid from os_thematic_pid where zid = #{params.projectId})
                         <if test="params.patentNos != null and params.patentNos.size()!=0">
@@ -1685,16 +1666,11 @@
                                 #{item}
                             </foreach>
                         </if>
-                        <if test="params.importTaskId != null and params.importTaskId.size()!=0">
+                        <if test="params.reportId != null">
                             or patentno in
-                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-                            <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                                     close=") ">
-                                #{item}
-                            </foreach>
+                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where REPORT_ID =#{params.reportId}
                             )
                         </if>
-                        )
                     </if>
                     <if test="params.projectId == null and params.patentNos != null and params.patentNos.size()!=0">
                         (patentno in
@@ -1702,24 +1678,16 @@
                                  close=")">
                             #{item}
                         </foreach>
-                        <if test="params.importTaskId != null and params.importTaskId.size()!=0">
+                        <if test="params.reportId != null">
                             or patentno in
-                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-                            <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                                     close=") ">
-                                #{item}
-                            </foreach>
+                            ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where REPORT_ID =#{params.reportId}
                             )
                         </if>
                         )
                     </if>
-                    <if test="params.projectId == null and (params.patentNos == null or params.patentNos.size()==0) and params.importTaskId != null and params.importTaskId.size()!=0">
+                    <if test="params.projectId == null and (params.patentNos == null or params.patentNos.size()==0) and params.reportId != null">
                         patentno in
-                        ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where IMPORTTASK_ID in
-                        <foreach item="item" collection="params.importTaskId" index="index" open="(" separator=","
-                                 close=") ">
-                            #{item}
-                        </foreach>
+                        ( select PATENT_NO from ASSO_IMPORTTASK_PATENT where REPORT_ID =#{params.reportId}
                         )
                     </if>
                     <if test="params.notInPatentNos != null and params.notInPatentNos.size!=0">