优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java

@@ -11,9 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
 public class InvoicingVo implements Vo {
     private static final long serialVersionUID = 1044076091993510821L;
 
-    @ApiModelProperty("名称")
-    private String name;
     @ApiModelProperty("开票信息sid")
     private String sid;
 
+    private String dictKey;
+
+    private String dictValue;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -19,6 +19,6 @@
     </select>
 
 	<select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
-		select name,sid from fin_company_invoicing where useOrgSid = #{useOrgSid}
+		select name dictValue,sid,sid as dictKey from fin_company_invoicing where useOrgSid = #{useOrgSid}
 	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -142,8 +142,11 @@
     <select id="selectByContractNoOne" resultType="java.lang.String">
         select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
+        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.contractNo = #{contractNo}
-          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
+        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
+        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">