Преглед изворни кода

开票记录中字段调整

lipf пре 2 месеци
родитељ
комит
2e8d72ebc8

+ 2 - 1
tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -441,8 +441,9 @@ public class ReceivableController {
     }
 
     @PostMapping("/getPlatFormReceivableList")
-    @Operation(summary = "获取平台协议列表")
+    @Operation(summary = "获取平台应收列表")
     public HttpResult<InsPlyIncomeVO> getPlatFormReceivableList(@RequestBody ReceivableQueryVo receivableQueryVo){
+        log.info("获取平台应收列表:receivableQueryVo=[{}]", JSONUtil.toJsonStr(receivableQueryVo));
         if (StrUtil.isBlank(receivableQueryVo.getQueryType())){
             receivableQueryVo.setQueryType("1");
         }

+ 4 - 3
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1488,8 +1488,8 @@
         ipii.update_by,
         eic.name as company_name,
         eic.name_simple as companyNameSimple,
-        sum( ipiis.actual_received_amount ) AS actual_received_amount,
-        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS paymentReason,
+        ipii.payment_reason ,
+        sum(ipiis.actual_received_amount) AS actual_received_amount, GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS settlementPaymentReason,
         ipii.status
         FROM
         ins_ply_income_invoice ipii
@@ -1562,7 +1562,8 @@
         eic.name_simple as companyNameSimple,
         sum( ipiis.actual_received_amount ) AS actual_received_amount,
         ipii.status,
-        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') as paymentReason,
+        ipii.payment_reason,
+        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') as settlementPaymentReason,
         GROUP_CONCAT(DISTINCT iffo.year SEPARATOR ',') AS year,
         GROUP_CONCAT(DISTINCT iffo.month SEPARATOR ',') AS month,
         iffo.partner_company_id,