资金相关

performance-web/src/main/java/com/clx/performance/service/impl/OwnerRunningWaterRecordServiceImpl.java

@@ -36,8 +36,8 @@ public class OwnerRunningWaterRecordServiceImpl implements OwnerRunningWaterReco
 
     @Override
     public SXSSFWorkbook exportOwnerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) {
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        param.setOwnerUserNo(loginUserInfo.getUserNo());
+//        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+//        param.setOwnerUserNo(loginUserInfo.getUserNo());
         IPage<OwnerAccountRunningWaterRecordVO> page = ownerRunningWaterRecordDao.ownerAccountRunningWaterPageList(param);
         List<OwnerAccountRunningWaterRecordVO> list = page.getRecords();
         // 组装表头

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerCaseOutProvider.java

@@ -13,7 +13,7 @@ public class OwnerCaseOutProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
                     " a.case_out_no, a.case_out_balance, a.account_type, " +
-                    " a.status,a.case_out_bank,a.case_out_bank_number,a.payment_time,a.create_by,a.platform_payment_bank_number,a.platform_payment_bank,a.payment_by,a.payment_proof,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as createTime,a.modified_time");
+                    " a.status,a.case_out_bank,a.case_out_bank_number,date_format(a.payment_time, '%Y-%m-%d %H:%i:%s') as payment_time,a.create_by,a.platform_payment_bank_number,a.platform_payment_bank,a.payment_by,a.payment_proof,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
             FROM("owner_case_out a");
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -26,7 +26,7 @@ public class OwnerRunningWaterRecordSqlProvider {
             if (ObjectUtil.isNotNull(param.getRunningWaterType())) {
                 WHERE("a.running_water_type = #{param.runningWaterType}");
             }
-            if (ObjectUtil.isNotNull(param.getRunningWaterNo())) {
+            if (StringUtils.isNotBlank(param.getRunningWaterNo())) {
                 WHERE("a.running_water_no = #{param.runningWaterNo}");
             }
             ORDER_BY("a.create_time desc");

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerTopUpProvider.java

@@ -13,7 +13,7 @@ public class OwnerTopUpProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
                     " a.top_up_no, a.top_up_balance, a.account_type, " +
-                    " a.status,a.drawing_bank, a.drawing_bank_number,a.drawing_proof,a.approval_time,a.approval_by,a.approval_turn_down,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
+                    " a.status,a.drawing_bank, a.drawing_bank_number,a.drawing_proof,date_format(a.approval_time, '%Y-%m-%d %H:%i:%s') as approval_time,a.approval_by,a.approval_turn_down,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
             FROM("owner_top_up a");
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime} and a.create_time <= #{param.endTime}");