Merge branch 'developer' into 'master'

Developer

See merge request !55

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/entity/CsvResultSetHelper.java

@@ -213,6 +213,7 @@ public class CsvResultSetHelper implements ResultSetHelper {
 							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter_threadLocal.get().format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						default:
+//							String s2 = String.valueOf(resultSet.getObject(i + 1));
 							Object val = resultSet.getObject(i + 1);
 							String s2="";
 							if (val != null) {

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java

@@ -1006,7 +1006,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 							break;
 						case Types.TIMESTAMP:
 							midCell.setCellStyle(yyyyMMddhhmmss);
-							midCell.setCellValue(DateUtils.parseDate(columnValue,new String[]{"yyyy-MM-dd hh:mm:ss"}));
+							midCell.setCellValue(DateUtils.parseDate(columnValue,new String[]{"yyyy-MM-dd HH:mm:ss"}));
 							break;
 						case Types.INTEGER:
 							midCell.setCellValue(Integer.valueOf(columnValue));

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FreeQueryServiceImpl.java

@@ -641,7 +641,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 								midCell.setCellValue(s);
 							}else {
 								midCell.setCellStyle(yyyyMMddhhmmss);
-								midCell.setCellValue(DateUtils.parseDate(s,new String[]{"yyyy-MM-dd hh:mm:ss"}));
+								midCell.setCellValue(DateUtils.parseDate(s,new String[]{"yyyy-MM-dd HH:mm:ss"}));
 							}
 							break;
 						case Types.DATE: