实体转换处理

WebService/src/main/resources/components/property-fee/propertyFee.js

@@ -35,12 +35,12 @@
                 $('.start_time').datetimepicker()
                           .on('changeDate', function (ev) {
                             var value = $(".start_time").val();
-                            vc.component.feeDetailInfo.startTime = (value + " 00:00:00");
+                            vc.component.feeDetailInfo.startTime = value ;
                           });
                 $('.end_time').datetimepicker()
                               .on('changeDate', function (ev) {
                                 var value = $(".end_time").val();
-                                vc.component.feeDetailInfo.endTime = (value + " 00:00:00");
+                                vc.component.feeDetailInfo.endTime = value ;
                               });
             },
             listFeeDetail:function(_page,_row){

java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java

@@ -33,7 +33,12 @@ public final class BeanConvertUtil {
                 Date date1 = null;
                 if (value instanceof String) {
                     String date = (String) value;
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                    SimpleDateFormat sdf = null;
+                    if (date.contains(":")) {
+                        sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+                    } else {
+                        sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    }
                     try {
                         date1 = sdf.parse(date);
                     } catch (ParseException e) {
@@ -48,11 +53,10 @@ public final class BeanConvertUtil {
         ConvertUtils.register(new Converter() { //注册一个日期转换器
 
             public Object convert(Class type, Object value) {
-                Date date1 = null;
                 if (value instanceof Date) {
                     return DateUtil.getFormatTimeString((Date) value, DateUtil.DATE_FORMATE_STRING_A);
                 }
-                return value;
+                return String.valueOf(value);
             }
         }, String.class);
     }