fix: cross year pkg; dept name search

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaAgentMapper.xml

@@ -210,7 +210,7 @@
         #{id}
       </foreach>
       <if test="entName != null">
-        and a.dept_name like concat('%', #{entName} ,'%')
+        and d.name like concat('%', #{entName} ,'%')
       </if>
     </where>
   </select>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskV2Mapper.xml

@@ -61,7 +61,9 @@
       AND ppkg.enable_flag = '0'
       AND ppkg.del_flag = '0'
       <if test="pkgIssueDate != null and pkgExpiryDate != null">
-        AND pkg.start_time &gt;= #{pkgIssueDate} AND pkg.end_time &lt;= #{pkgExpiryDate}
+        AND 
+        (pkg.start_time &gt;= #{pkgIssueDate} AND pkg.start_time &lt;= #{pkgExpiryDate}
+        OR pkg.end_time &gt;= #{pkgIssueDate} AND pkg.end_time &lt;= #{pkgExpiryDate})
       </if>
       <if test="prov != null and prov != ''">
         AND ppkg.prov_abbr = #{prov}
@@ -127,7 +129,9 @@
         </foreach>
       </if>
       <if test="pkgIssueDate != null and pkgExpiryDate != null">
-        AND pkg.start_time &gt;= #{pkgIssueDate} AND pkg.end_time &lt;= #{pkgExpiryDate}
+        AND 
+        (pkg.start_time &gt;= #{pkgIssueDate} AND pkg.start_time &lt;= #{pkgExpiryDate}
+        OR pkg.end_time &gt;= #{pkgIssueDate} AND pkg.end_time &lt;= #{pkgExpiryDate})
       </if>
       <if test="prov != null and prov != ''">
         AND ppkg.prov_abbr = #{prov}