فهرست منبع

1.控制台利润分析调整

wuhp 2 سال پیش
والد
کامیت
dbf900561e

+ 1 - 1
src/main/java/com/ydtech/modules/ins/model/vo/res/BxSettlementFeesNorExcel.java

@@ -63,7 +63,7 @@ public class BxSettlementFeesNorExcel implements Serializable {
 
     @ApiModelProperty("手续费金额")
     @ExcelProperty(value = "手续费金额",index = 9)
-    private BigDecimal noSuperviseCostsPremiums;
+    private BigDecimal commissionFeevalue;
 
 
 }

+ 2 - 0
src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -2916,9 +2916,11 @@
                     ins_fee_order_new ifo
                         LEFT JOIN ins_fee_audit ifa ON ifo.ins_order_no = ifa.ins_order_no
                         LEFT JOIN ins_area_company iac ON ifa.ins_order_no = iac.id
+                        LEFT JOIN ins_orders io ON iac.orderno = io.orderno
                 WHERE
                     ifa.auditstatus = '1'
                   AND iac.orderstatus = '3'
+                  AND io.orderstatus = '3'
                 GROUP BY
                     DATE_FORMAT( iac.signing_time, '%Y-%m' )
             ) d  on  d.signingTime =a.signingTime