处理进展细节完善

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -322,23 +322,23 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
                 stepList.add(new ChangeLogDetail("财务人员审核",null, null,null));
                 stepList.add(new ChangeLogDetail("财务人员打款", null, null, null));
-            }else if("1".equals(action.getAuditingStatus())){
-                stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
-                stepList.add(new ChangeLogDetail("财务人员审核",action.getPaymentTime(), true,null));
-                stepList.add(new ChangeLogDetail("财务人员打款", action.getPaymentTime(), true, null));
-            }else if("2".equals(action.getAuditingStatus())){
-                stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
-                stepList.add(new ChangeLogDetail("财务人员审核",action.getPaymentTime(), true,null));
-                stepList.add(new ChangeLogDetail("财务审核不通过", action.getRejectTime(), false, null));
             }else if(StrUtil.isEmpty(action.getAuditingStatus())){
-                if("".equals(action.getStatus())){
-                    stepList.add(new ChangeLogDetail("费用审核通过",action.getCreateTime(),true, null));
-                    stepList.add(new ChangeLogDetail());
-                    stepList.add(new ChangeLogDetail());
-                }else if("1".equals(action.getStatus())){
-                    stepList.add(new ChangeLogDetail("费用审核通过",action.getCreateTime(),true, null));
-                    stepList.add(new ChangeLogDetail());
-                    stepList.add(new ChangeLogDetail());
+                if("1".equals(action.getStatus())){
+                    if("1".equals(action.getIncomeAndExpense())){
+                        stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
+                        stepList.add(new ChangeLogDetail("财务人员审核",action.getPaymentTime(), true,null));
+                        stepList.add(new ChangeLogDetail("财务人员打款", action.getPaymentTime(), true, null));
+                    }
+                    if("0".equals(action.getIncomeAndExpense())){
+                        // 保费收入
+                        stepList.add(new ChangeLogDetail("费用审核通过",action.getCreateTime(),true, null));
+                        stepList.add(new ChangeLogDetail());
+                        stepList.add(new ChangeLogDetail());
+                    }
+                }else if("2".equals(action.getStatus())){
+                    stepList.add(new ChangeLogDetail("提交提现申请",action.getCreateTime(),true, null));
+                    stepList.add(new ChangeLogDetail("财务人员审核",action.getPaymentTime(), true,null));
+                    stepList.add(new ChangeLogDetail("财务审核不通过", action.getRejectTime(), false, null));
                 }
             }
             action.setStepList(stepList);

tenant/organization/src/main/resources/mapper/SysAmountAuditingMapper.xml

@@ -278,7 +278,11 @@
         ELSE 1
         -- 负数为支出
         END AS incomeAndExpense,
-        '1' as status,
+        case
+            when suacl.is_delete = 0 then 1
+            when suacl.is_delete = 1 then 2
+        else -1
+        end AS status,
         suacl.oper_type,
         CASE
         suacl.oper_type