Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -641,7 +641,8 @@ public class DPSubServiceImpl {
                 }
             } else if ("dateTime".equals(xObj.getString("componentKey"))) {
                 if (!ValidationUtil.isEmpty(value)) {
-                    SimpleDateFormat sdf = new SimpleDateFormat(visualParams.getString("format"));
+                    String f = visualParams.getString("format").replace("Y","y").replace("D","d");
+                    SimpleDateFormat sdf = new SimpleDateFormat(f);
                     Date date = null;
                     try {
                         date = sdf.parse(ValidationUtil.validateString(value));
@@ -649,6 +650,7 @@ public class DPSubServiceImpl {
                         throw new RuntimeException(e);
                     }
                     jsonObject.put("value",sdf.format(date));
+
                 }
             } else if ("checkbox".equals(xObj.getString("componentKey"))) {
                 ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null);