应付账款 应付概览，导出收支明细中提现中的账户余额不对，而且金额应该是负数

应付账款	应付概览，导出收支明细中操作类型和备注内容一样，应该有一个是收支类型，显示收入/支出

commons/src/main/java/com/jzg/commons/entity/account/po/SysUserAccountChangeLog.java

@@ -81,10 +81,26 @@ public class SysUserAccountChangeLog extends BaseModel {
     @Schema(description = "操作类型")
     private int operType;
 
-    @ExcelProperty("操作类型")
+    @ExcelIgnore
     @TableField(exist = false)
     private String operTypeName;
 
+    @ExcelProperty("收支类型")
+    @TableField(exist = false)
+    private String operClassName;
+
+
+    @ExcelIgnore
+    private static Map<Integer,String> operClassMap = new  HashMap<Integer,String>();
+    static {
+        operClassMap.put(1,"收入");
+        operClassMap.put(2,"收入");
+        operClassMap.put(3,"支出");
+        operClassMap.put(4,"支出");
+        operClassMap.put(5,"支出");
+    }
+
+
     @ExcelIgnore
     private static Map<Integer,String> operTypeMap = new  HashMap<Integer,String>();
     static {
@@ -99,6 +115,10 @@ public class SysUserAccountChangeLog extends BaseModel {
         return operTypeMap.getOrDefault(this.operType, Objects.toString(this.operType));
     }
 
+    public String getOperClassName(){
+        return operClassMap.getOrDefault(this.operType, Objects.toString(this.operType));
+    }
+
     @ExcelProperty("关联订单ID")
     @Schema(description = "关联订单ID")
     private String relatedOrderId;

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserAccountIncomeLogMapper.java

@@ -23,66 +23,68 @@ public interface SysUserAccountIncomeLogMapper extends BaseMapper<SysUserAccount
     @Select("""
         
             select * from(
-        	SELECT
-        		a.system_code ,
-        		ioci.license_no,
-        		io.signing_time AS signTime,
-        		saa.auditing_time AS payTime,
-        		a.user_id,
-        		a.jzg_info_id,
-        		a.user_name,
-        		a.amount,
-        		a.amount_before,
-        		a.amount_after,
-        		a.oper_type,
-        		a.related_order_id,
-        		a.bank_card_id_to,
-        		a.bank_card_no_to,
-        		a.bank_card_id_in,
-        		a.bank_card_no_in,
-        		a.is_delete,
-        		a.create_time,
-        		a.remark,
-        		a.related_amount_auditing_id,
-        		a.status
-        	FROM
-        		sys_user_account_change_log a
-        	LEFT JOIN ins_orders_car_info ioci ON
-        		a.related_order_id = ioci.order_no
-        	LEFT JOIN ins_orders io ON
-        		a.related_order_id = io.id
-        	LEFT JOIN sys_amount_auditing saa
-        	ON
-        		saa.id = a.related_amount_auditing_id
-        		AND saa.system_code = 'G111'
-        union ALL
-        	select
-        		saa.system_code ,
-        		null as license_no,
-        		null as signTime,
-        		null as payTime,
-        		saa.user_id,
-        		null as zg_info_id,
-        		su.username as user_name,
-        		saa.amount,
-        		(saa.amount + saa.balance_amount) as amount_before,
-        		saa.balance_amount as amount_after,
-        		5 as oper_type,
-        		null as related_order_id,
-        		null as bank_card_id_to,
-        		null as bank_card_no_to,
-        		null as bank_card_id_in,
-        		null as bank_card_no_in,
-        		null as is_delete,
-        		saa.create_time,
-        		'提现中' as remark,
-        		null as related_amount_auditing_id,
-        		10 as status
-        	from
-        		sys_amount_auditing saa
-        	    left join sys_user su on saa.user_id = su.id
-        	where
-        		saa.auditing_status = 0
+	SELECT
+                a.system_code,
+                ioci.license_no,
+                io.signing_time AS signTime,
+                saa.auditing_time AS payTime,
+                a.user_id,
+                a.jzg_info_id,
+                a.user_name,
+                a.amount,
+                a.amount_before,
+                a.amount_after,
+                a.oper_type,
+                a.related_order_id,
+                a.bank_card_id_to,
+                a.bank_card_no_to,
+                a.bank_card_id_in,
+                a.bank_card_no_in,
+                a.is_delete,
+                a.create_time,
+                a.remark,
+                a.related_amount_auditing_id,
+                a.status
+            FROM
+                sys_user_account_change_log a
+            LEFT JOIN ins_orders_car_info ioci ON
+                a.related_order_id = ioci.order_no
+            LEFT JOIN ins_orders io ON
+                a.related_order_id = io.id
+            LEFT JOIN sys_amount_auditing saa
+                ON
+                saa.id = a.related_amount_auditing_id
+            WHERE
+                a.system_code = #{systemCode}
+         UNION ALL
+            SELECT
+                saa.system_code,
+                NULL AS license_no,
+                NULL AS signTime,
+                NULL AS payTime,
+                saa.user_id
+                ,
+                NULL AS zg_info_id,
+                su.username AS user_name,
+                0 - saa.amount as amount,
+                saa.amount + saa.balance_amount AS amount_before,
+                saa.balance_amount AS amount_after,
+                5 AS oper_type,
+                NULL AS related_order_id,
+                NULL AS bank_card_id_to,
+                NULL AS bank_card_no_to,
+                NULL AS bank_card_id_in,
+                NULL AS bank_card_no_in,
+                NULL AS is_delete,
+                saa.create_time,
+                '提现中' AS remark,
+                NULL AS related_amount_auditing_id,
+                10 AS status
+            FROM
+                sys_amount_auditing saa
+               LEFT JOIN sys_user su ON saa.user_id = su.id
+            WHERE
+                saa.auditing_status = 0
         ) mm
         where
         	mm.user_id =  #{ywyUserId}