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

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/recharge/service/impl/SysDeptInvoiceServiceImpl.java

@@ -92,7 +92,7 @@ public class SysDeptInvoiceServiceImpl extends ServiceImpl<SysDeptInvoiceMapper,
         Set<Integer> queryDeptIds = new HashSet<>();
         queryDeptIds.add(deptId);
 
-        // 查询园区关联的企业
+        // 查询关联的企业
         List<SysDeptRelation> deptRelations = deptRelationService.list(Wrappers.<SysDeptRelation>lambdaQuery()
                 .eq(SysDeptRelation::getAncestor, deptId)
                 .ne(SysDeptRelation::getDescendant, deptId));

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

@@ -18,12 +18,13 @@
 
     <select id="pageInvoiceScorePacakgeRelation"
             resultType="com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceRelationVO">
-        SELECT p.id, p.id as score_package_id, p.score_package_name, p.score, p.score_package_status, p.send_package_dept_id as dept_id, p.create_time as package_create_time,
+        SELECT p.id, p.id as score_package_id, p.score_package_name, p.score, p.score_package_status, p.package_finish_status,
+               p.send_package_dept_id as dept_id, p.create_time as package_create_time,
              r.invoice_id, r.invoice_status, r.invoice_time, r.create_time, r.create_user, r.update_time, r.update_user
         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 = '1' AND p.typeid in ('3', '4')
+            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status = '5' AND p.typeid in ('3', '4')
                 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=")">
@@ -39,16 +40,18 @@
                 AND r.create_time between #{query.createTime[0]} and #{query.createTime[1]}
             </if>
         </where>
+        ORDER BY p.create_time DESC
     </select>
 
     <select id="listInvoiceScorePacakgeRelation"
             resultType="com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceRelationVO">
-        SELECT p.id, p.id as score_package_id, p.score_package_name, p.score, p.score_package_status, p.send_package_dept_id as dept_id, p.create_time as package_create_time,
+        SELECT p.id, p.id as score_package_id, p.score_package_name, p.score, p.score_package_status, p.package_finish_status,
+               p.send_package_dept_id as dept_id, p.create_time as package_create_time,
         r.invoice_id, r.invoice_status, r.invoice_time, r.create_time, r.create_user, r.update_time, r.update_user
         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 = '1' AND p.typeid in ('3', '4')
+            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status = '5' AND p.typeid in ('3', '4')
                 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=")">
@@ -64,20 +67,23 @@
                 AND r.create_time between #{query.createTime[0]} and #{query.createTime[1]}
             </if>
         </where>
+        ORDER BY p.create_time DESC
     </select>
 
     <select id="pageInvoiceScorePacakgeRelation2"
             resultType="com.qunzhixinxi.hnqz.admin.recharge.vo.SysDeptInvoiceRelationVO">
-        SELECT p.id, p.id as score_package_id, p.score_package_name, p.score, p.score_package_status, p.send_package_dept_id as dept_id, p.create_time as package_create_time,
+        SELECT p.id, p.id as score_package_id, p.score_package_name, p.score, p.score_package_status, p.package_finish_status,
+               p.send_package_dept_id as dept_id, p.create_time as package_create_time,
         r.invoice_id, r.invoice_status, r.invoice_time, r.create_time, r.create_user, r.update_time, r.update_user
         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 = '1' AND p.typeid in ('3', '4')
+            AND (p.package_type1 = '1' AND p.package_type2 = '1' AND p.score_package_status = '5' AND p.typeid in ('3', '4')
                 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}
         </where>
+        ORDER BY p.create_time DESC
     </select>
 
 </mapper>