Merge branch 'v1.7' into dev

backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java

@@ -29,7 +29,7 @@ public class ColumnPermissionsController {
 
     @ApiOperation("保存")
     @PostMapping("save")
-    public void save(@RequestBody DatasetColumnPermissions datasetColumnPermissions) throws Exception {
+    public DatasetColumnPermissions save(@RequestBody DatasetColumnPermissions datasetColumnPermissions) throws Exception {
         ColumnPermissionService columnPermissionService = SpringContextUtil.getBean(ColumnPermissionService.class);
         DataSetColumnPermissionsDTO request = new DataSetColumnPermissionsDTO();
         request.setAuthTargetType(datasetColumnPermissions.getAuthTargetType());
@@ -48,7 +48,7 @@ public class ColumnPermissionsController {
                 throw new Exception(Translator.get("i18n_cp_exist"));
             }
         }
-        columnPermissionService.save(datasetColumnPermissions);
+        return columnPermissionService.save(datasetColumnPermissions);
     }
 
     @ApiOperation("查询")

backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java

@@ -942,24 +942,24 @@ public class EsQueryProvider extends QueryProvider {
         }
 
         if (StringUtils.isEmpty(dateStyle)) {
-            return "YYYY-MM-dd HH:mm:ss";
+            return "yyyy-MM-dd HH:mm:ss";
         }
 
         switch (dateStyle) {
             case "y":
-                return "YYYY";
+                return "yyyy";
             case "y_M":
-                return "YYYY" + split + "MM";
+                return "yyyy" + split + "MM";
             case "y_M_d":
-                return "YYYY" + split + "MM" + split + "dd";
+                return "yyyy" + split + "MM" + split + "dd";
             case "H_m_s":
                 return "HH:mm:ss";
             case "y_M_d_H_m":
-                return "YYYY" + split + "MM" + split + "dd" + " HH:mm";
+                return "yyyy" + split + "MM" + split + "dd" + " HH:mm";
             case "y_M_d_H_m_s":
-                return "YYYY" + split + "MM" + split + "dd" + " HH:mm:ss";
+                return "yyyy" + split + "MM" + split + "dd" + " HH:mm:ss";
             default:
-                return "YYYY-MM-dd HH:mm:ss";
+                return "yyyy-MM-dd HH:mm:ss";
         }
     }
 

backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java

@@ -21,7 +21,7 @@ public class EsSqlLConstants extends SQLConstants {
 
     public static final String ROUND = "ROUND(%s, %s)";
 
-    public static final String DEFAULT_DATE_FORMAT = "YYYY-MM-dd HH:mm:ss";
+    public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     public static final String WHERE_VALUE_NULL = "(NULL,'')";