提交提现状态列表添加

src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceDto.java

@@ -67,4 +67,7 @@ public class MyCollectInAdvanceDto {
 
     @ApiModelProperty(value = "支出/收入id")
     private String  id;
+
+    @ApiModelProperty(value = "提现状态  1 提现申请  2.处理中 3.提现失败  4.提现成功")
+    private String auditingStatus;
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -1040,6 +1040,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 } else if ("2".equals(dto.getBusinessSegmentsType()) && "2".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("1");
                     dto.setTransactionType("4");
+                    //退款设置为空
+                    dto.setAuditingStatus("");
                     //提现
                 }else if("6".equals(dto.getTransactionType()) && "1".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("2");

src/main/resources/mapper/modules/admin/SysUserAccountHistoryMapper.xml

@@ -109,15 +109,22 @@
             ins.signing_time as "signingTime",
             o.licenseno as "licenseno",
             his.amount as "amount",
-            business_eegments_type  as "businessSegmentsType",
+            his.business_eegments_type  as "businessSegmentsType",
             his.documentary as "incomeAndExpensesType",
             his.property  as  "transactionType",
             his.create_time  as "createTime",
-            his.auditiing_id as "auditiingId"
+            his.auditiing_id as "auditiingId",
+            CASE saa.auditing_status
+            WHEN '2' THEN '提现中'
+            WHEN '3' THEN '已提现'
+            WHEN '4' THEN '驳回'
+            ELSE ''
+            END  AS "auditingStatus"
         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
+            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
         WHERE
             his.property !=1  and  his.property !=2
           <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '0' ">