台账导出有时间

src/main/java/com/xjrsoft/module/ledger/controller/LedgerExportController.java

@@ -29,6 +29,8 @@ import org.ssssssss.magicapi.modules.db.model.PageResult;
 import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,13 +147,34 @@ public class LedgerExportController {
 
         List<List<Object>> list = ListUtils.newArrayList();
 
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        SimpleDateFormat sdfWithTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        SimpleDateFormat sdfTime = new SimpleDateFormat("HH:mm:ss");
+
+
         for (Object obj : res.getList()) {
             List<Object> data = ListUtils.newArrayList();
 
             Entity rowValue = Convert.convert(Entity.class, obj);
 
             for (List<String> head : headlist){
-                data.add(rowValue.get(head.get(0)));
+                Object value = rowValue.get(head.get(0));
+
+                if (value instanceof Date) {
+                    String timeStr = sdfTime.format(value);
+                    String dateStr = "";
+
+                    if (timeStr.equals("00:00:00")) {
+                        dateStr = sdf.format(value);
+                    } else {
+                        dateStr = sdfWithTime.format(value);
+                    }
+                    data.add(dateStr);
+                }else {
+                    data.add(rowValue.get(head.get(0)));
+                }
             }
 
             list.add(data);