天枢提交(湖南)

service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/TsinfoController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.founder.commonutils.util.HttpClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.xssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,14 +35,16 @@ public class TsinfoController {
         XSSFWorkbook wb = new XSSFWorkbook();
         try {
             // table 登录(logon_log_acc)  注册(register)   账户明细(consume_query_real_time)
-            String[] headersNamelogon = {"登录账号","支付宝用户ID","账户名","客户端IP","操作发生时间","对应的协查数据"};
-            String[] headersFieldlogon = {"loginId","userId","name","clientIp","actionDt","principalValue"};
-            createExcel(exportData("logon_log_acc",id,sessionid),  "登录", wb,headersNamelogon,headersFieldlogon);
-
             String[] headersNameregister = {"用户ID","登录邮箱","登录手机","账户名称","证件类型","证件号","用户可用余额","绑定手机","注册日期","绑定银行卡","对应的协查数据"};
             String[] headersFieldregister= {"userId","loginEmail","userLoginId","realName","certType","certNo","balance","bindMobile","registerDate","bindCard","principalValue"};
             createExcel(exportData("register",id,sessionid),"注册", wb,headersNameregister,headersFieldregister);
 
+
+
+            String[] headersNamelogon = {"登录账号","支付宝用户ID","账户名","客户端IP","操作发生时间","对应的协查数据"};
+            String[] headersFieldlogon = {"loginId","userId","name","clientIp","actionDt","principalValue"};
+            createExcel(exportData("logon_log_acc",id,sessionid),  "登录", wb,headersNamelogon,headersFieldlogon);
+
             String[] headersNameConsumer = {"交易号","商户订单号","创建时间","付款时间","交易来源地","交易类型","用户信息","用户信息","交易对方信息","交易对方信息","消费名称","金额（元）","支付方式","收/支","交易状态","对应的协查数据","收入金额(+)（元）","支出金额(-)（元）","余额（元）","服务费","成功退款（元）","银行清算流水号","关联交易号","付款方银行卡账号","付款方银行名称","收款方银行卡账号","收款方银行名称","收货人姓名","收货人电话","收货人地址"};
             String[] headersFieldConsumer = {"bizInNo","bizOutNo","gmtBizCreate","gmtBizModified","consumeSite","consumeType","userId","userName","oppositeUserId","oppositeUserName","consumeTitle","consumeFee","fundToolTypeName","inOut","bizState","principalValue","balanceInAmount","balanceOutAmount","accountBalance","serviceFee","consumeRefundFee","bankTransactionSerial","refBizInNo","transOutCardNumber","transOutBankName","transInCardNumber","transInBankName","receiverName","receiverMobileNo","receiverAddress"};
             createExcel(exportData("consume_query_real_time",id,sessionid), "交易", wb,headersNameConsumer,headersFieldConsumer);
@@ -237,7 +240,7 @@ public class TsinfoController {
                     value = "";
                 }
                 // 时间戳转时间
-                if(Arrays.asList("actionDt","registerDate","gmtBizCreate","gmtBizModified").contains(filed)){
+                if(Arrays.asList("actionDt","registerDate","gmtBizCreate","gmtBizModified").contains(filed)&& !StringUtils.isEmpty(value)){
                     value = stampToDate(value);
                 }
                 cells = rows.createCell(j);