修改String转date处理方式

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

@@ -13,14 +13,17 @@
                 <div class="ibox-content">
 
                     <div class="row">
-                        <div class="col-sm-4 input-group">
+                        <div class="col-sm-3 input-group">
                             <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control form-control-sm start_time">
+                        </div>
+                        <div class="col-sm-2">
+
                         </div>
                         <div class="col-sm-3 input-group">
                             <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control form-control-sm end_time">
                         </div>
 
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
 
                         </div>
 

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

@@ -31,16 +31,16 @@
         methods:{
             initDate:function(){
                 $(".start_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "day"});
-                $(".end_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "day"});
+                $(".end_time").datetimepicker({format: 'yyyy-mm-dd', language: 'zh-CN',minView: "hour"});
                 $('.start_time').datetimepicker()
-                          .on('hide', function (ev) {
+                          .on('changeDate', function (ev) {
                             var value = $(".start_time").val();
-                            vc.component.feeDetailInfo.startTime = value;
+                            vc.component.feeDetailInfo.startTime = (value + " 00:00:00");
                           });
                 $('.end_time').datetimepicker()
-                              .on('hide', function (ev) {
+                              .on('changeDate', function (ev) {
                                 var value = $(".end_time").val();
-                                vc.component.feeDetailInfo.endTime = value;
+                                vc.component.feeDetailInfo.endTime = (value + " 00:00:00");
                               });
             },
             listFeeDetail:function(_page,_row){

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

@@ -33,7 +33,7 @@ public final class BeanConvertUtil {
                 Date date1 = null;
                 if (value instanceof String) {
                     String date = (String) value;
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                     try {
                         date1 = sdf.parse(date);
                     } catch (ParseException e) {

java110-common/src/test/java/com/java110/common/util/BeanConvertUtilTest.java

@@ -33,7 +33,7 @@ public class BeanConvertUtilTest extends TestCase {
 
     public void testCoverBeanStringToDate(){
         Map reqJson = new HashMap();
-        reqJson.put("startTime","2019-06-02");
+        reqJson.put("startTime","2019-06-02 00:00:00");
         //reqJson.put("endTime","2019-06-03");
 
         FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class);