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

收入明细添加审核状态 1 自动审核 2.人工审核

hxl13994548489 пре 2 година
родитељ
комит
005ed1bcc7

+ 4 - 0
src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceDto.java

@@ -70,4 +70,8 @@ public class MyCollectInAdvanceDto {
 
     @ApiModelProperty(value = "提现状态  1 提现申请  2.处理中 3.提现失败  4.提现成功")
     private String auditingStatus;
+
+    @ApiModelProperty(value = "审核状态  1 自动审核  2.手动审核")
+    private String checkStatus;
+
 }

+ 4 - 1
src/main/resources/mapper/modules/admin/SysUserAccountHistoryMapper.xml

@@ -119,12 +119,15 @@
             WHEN '3' THEN '已提现'
             WHEN '4' THEN '驳回'
             ELSE ''
-            END  AS "auditingStatus"
+            END  AS "auditingStatus",
+            CASE WHEN '自动审核' THEN '1'
+            ELSE '2' END  as "checkStatus"
         FROM
             sys_user_account_history his
             LEFT JOIN ins_area_company ins ON his.suborder = ins.id
             LEFT JOIN ins_orders o ON o.orderno = ins.orderno
             left join  sys_amount_auditing saa  on saa.id =his.auditiing_id
+            left join  ins_fee_audit  ifa   on ifa.ins_order_no = ins.id
         WHERE
             his.property !=1  and  his.property !=2
           <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '0' ">