Kaynağa Gözat

缺失功能:
私有应收 加个结算状态:已结算、已开票未结算、未结算

jiakai 2 ay önce
ebeveyn
işleme
89d99e4d46

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/ReceivableQueryVo.java

@@ -107,6 +107,9 @@ public class ReceivableQueryVo extends PageRequest {
     @Schema(description = "结算状态")
     private String settlementStatus;
 
+    @Schema(description = "开票和结算状态")
+    private String invoiceSettlementStatus;
+
     @Schema(description = "增加类型")
     private String addType;
 

+ 7 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -332,6 +332,13 @@
             left join sys_user su on su.id = suji.user_id and su.is_delete = 0
             where sujis.type_attr =#{receivableQueryVo.typeAttr})
         </if>
+        <if test="receivableQueryVo.invoiceSettlementStatus != null and receivableQueryVo.invoiceSettlementStatus != ''">
+            AND ipi.id  in (
+            select ipil.income_id  from ins_ply_income_invoice_link ipil
+            LEFT JOIN ins_ply_income_invoice ipii ON ipil.invoice_id = ipii.id AND ipii.is_delete = 0
+            where ipii.status = #{receivableQueryVo.invoiceSettlementStatus} and ipil.is_delete = 0
+            )
+        </if>
         <if test = "receivableQueryVo.agreementType != null and receivableQueryVo.agreementType != ''">
             AND ipi.agreement_type = #{receivableQueryVo.agreementType}
         </if>