fix: typeid大包小包判断

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

@@ -24,9 +24,9 @@
         FROM wm_score_package p
         LEFT JOIN sys_dept_invoice_relation r on r.package_id = p.id AND r.del_flag = '0'
         <where>
-            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status in ('4', '5') AND p.typeid in ('3', '4')
+            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status in ('4', '5') AND p.typeid in ('3', '4', '5')
                      AND (p.relation_score_id is null OR length(relation_score_id) = '')
-                OR (p.old_package = '0' AND p.package_finish_status = '1' AND p.typeid not in ('3', '4')))
+                OR (p.old_package = '0' AND p.package_finish_status = '1' AND p.typeid not in ('3', '4', '5')))
             AND p.send_package_dept_id IN
             <foreach collection="deptIdList" item="deptId" index="idx" separator="," open="(" close=")">
                 #{deptId}
@@ -52,9 +52,9 @@
         FROM wm_score_package p
         LEFT JOIN sys_dept_invoice_relation r on r.package_id = p.id AND r.del_flag = '0'
         <where>
-            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status in ('4', '5') AND p.typeid in ('3', '4')
+            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status in ('4', '5') AND p.typeid in ('3', '4', '5')
                     AND (p.relation_score_id is null OR length(relation_score_id) = '')
-                OR (p.old_package = '0' AND p.package_finish_status = '1' AND p.typeid not in ('3', '4')))
+                OR (p.old_package = '0' AND p.package_finish_status = '1' AND p.typeid not in ('3', '4', '5')))
             AND p.send_package_dept_id IN
             <foreach collection="deptIdList" item="deptId" index="idx" separator="," open="(" close=")">
                 #{deptId}
@@ -80,9 +80,9 @@
         FROM wm_score_package p
         LEFT JOIN sys_dept_invoice_relation r on r.package_id = p.id
         <where>
-            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status in ('4', '5') AND p.typeid in ('3', '4')
+            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status in ('4', '5') AND p.typeid in ('3', '4', '5')
                     AND (p.relation_score_id is null OR length(relation_score_id) = '')
-                OR (p.old_package = '0' AND p.package_finish_status = '1' AND p.typeid not in ('3', '4')))
+                OR (p.old_package = '0' AND p.package_finish_status = '1' AND p.typeid not in ('3', '4', '5')))
             AND r.del_flag = '0'
             AND r.invoice_id = #{invoiceId}
         </where>

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

@@ -812,7 +812,7 @@
 		from wm_score_package o
 		left join sys_dept u on u.dept_id = o.accept_sug
 		<where>
-			o.typeid not in ('3','4')
+			o.typeid not in ('3', '4', '5')
 			and o.old_package = '0'
 			AND o.send_package_dept_id = #{sendDeptId}
 			<if test="scorePackageName != null">
@@ -832,7 +832,7 @@
 		select o.*,u.name as acceptSug
 		from wm_score_package o
 		left join sys_dept u on u.dept_id=o.accept_sug
-		where 1 = 1 and o.typeid not in (3,4)
+		where 1 = 1 and o.typeid not in (3, 4, 5)
 		<if test="query.id != null">
 			AND o.id != #{query.id,jdbcType=INTEGER}
 		</if>
@@ -976,14 +976,14 @@
 		FROM wm_score_package
 		WHERE id != #{id,jdbcType=VARCHAR}
 		  AND enable_flag = '0'
-		  AND typeid NOT IN (3, 4)
+		  AND typeid NOT IN (3, 4, 5)
 		ORDER BY id DESC
 	</select>
 	<select id="selectByReRelatedService" resultMap="wmScorePackageMap" parameterType="java.lang.String">
 		select
 		*
 		from wm_score_package
-		where 1=1 and typeid not in(3,4) and enable_flag='0'
+		where 1=1 and typeid not in(3, 4, 5) and enable_flag='0'
 		<if test="sendPackageDeptId != null and sendPackageDeptId !=''">
 			AND send_package_dept_id = #{sendPackageDeptId,jdbcType=VARCHAR}
 		</if>