出库相关

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java

@@ -27,7 +27,7 @@ public class DeliveredFinVo {
     @ApiModelProperty("款项情况")
     private List<FinSelectVo> finSelectVoList = new ArrayList<>();
     @ApiModelProperty("发票情况")
-    private VinInvoiceVo vinInvoiceVo;
+    private VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();
 
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java

@@ -21,4 +21,6 @@ public class FinSelectVo {
 
     @ApiModelProperty("未收金额")
     private String notSubscriptionMoney;
+
+    private String remarks;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java

@@ -21,4 +21,6 @@ public class ReceiveSeleteVo {
 
     @ApiModelProperty("未收金额")
     private String notSubscriptionMoney;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

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

@@ -123,8 +123,28 @@
     </select>
 
     <select id="receivedSelect" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo">
-        select furd.receivablesName,furd.reveivableMoney,sum(fs.subscriptionMoney) as subscriptionMoneyAll from fin_uncollected_receivables_detailed furd
-        left join fin_selected_receivables_detailed fs on fs.receivablesSid = furd.sid
-        where furd.busVinSid = #{busVinSid} and fs.auditState = 3
+        SELECT
+            furd.receivablesName,
+            furd.reveivableMoney, (
+                SELECT
+                    sum(subscriptionMoney)
+                FROM
+                    fin_selected_receivables_detailed
+                WHERE
+                    receivablesSid = furd.sid
+                  AND auditState = 3) as subscriptionMoneyAll,
+        (
+        SELECT
+        group_concat(remarks)
+        FROM
+        fin_selected_receivables_detailed
+        WHERE
+        receivablesSid = furd.sid
+        AND auditState = 3
+        ) AS remarks
+        FROM
+            fin_uncollected_receivables_detailed furd
+        WHERE
+            furd.busVinSid = #{busVinSid}
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -168,6 +168,6 @@
     </select>
 
     <select id="selectByVinSid" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice">
-        select * from fin_vehicle_invoice where vehicleSid = #{vinSid} limit 1
+        select *,DATE_FORMAT(transferTime,'%Y-%m-%d') as transferTime,DATE_FORMAT(invoiceDate,'%Y-%m-%d') as invoiceDate from fin_vehicle_invoice where vehicleSid = #{vinSid} limit 1
     </select>
 </mapper>