财务收款确认查询

src/main/java/org/jeecg/common/dto/payment/FinanceListReqDTO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 public class FinanceListReqDTO {
     private String billCode;
     private String pkOrg;
+    private String type;
 
     public FinanceListReqDTO() {
     }

src/main/java/org/jeecg/modules/archives/controller/ProjectManageArchivesController.java

@@ -519,7 +519,7 @@ public class ProjectManageArchivesController {
 		//采购发票，销售发票
 		QueryWrapper<InvoiceManagePurchase> purchaseQueryWrapper = new QueryWrapper<>();
 		purchaseQueryWrapper.eq("del_flag", "0");
-		purchaseQueryWrapper.eq("pro_id", id);
+		purchaseQueryWrapper.eq("pro_archives_id", id);
 		List<InvoiceManagePurchase> purchases = invoiceManagePurchaseService.list(purchaseQueryWrapper);
 		if(!CollectionUtils.isEmpty(purchases)){
 			throw new JeecgBootException("删除失败，采购或销售发票已使用");

src/main/java/org/jeecg/modules/payment/mapper/xml/ManagerPaymentAndReceiptSlipMapper.xml

@@ -83,6 +83,10 @@
             <if test = "reqDTO.pkOrg != null and reqDTO.pkOrg != ''">
                 AND a.pk_org = #{reqDTO.pkOrg}
             </if>
+            <if test = "reqDTO.type != null and reqDTO.type != ''">
+                AND a.type = #{reqDTO.type}
+            </if>
+            ORDER BY a.create_time DESC ,b.sort ASC
       </select>
 
 </mapper>