feat: 2. 个人承接任务中，直发包（未关联其他积分包），积分包状态是“已完成待结算”和“已提交结算申请”的

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

@@ -24,7 +24,8 @@
         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 = '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')
+                     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')))
             AND p.send_package_dept_id IN
             <foreach collection="deptIdList" item="deptId" index="idx" separator="," open="(" close=")">
@@ -51,7 +52,8 @@
         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 = '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')
+                    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')))
             AND p.send_package_dept_id IN
             <foreach collection="deptIdList" item="deptId" index="idx" separator="," open="(" close=")">
@@ -78,7 +80,8 @@
         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 = '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')
+                    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')))
             AND r.del_flag = '0'
             AND r.invoice_id = #{invoiceId}