日了个历

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

@@ -125,6 +125,8 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         }
     };
     private Boolean mWorkovertime = false;
+    private String start_hour_min = "";
+    private String end_hour_min = "";
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -320,12 +322,14 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                             currentSelectDate = null;//清空
                         }
                         v_date_end.setText(v_date_start.getText().toString());
+                        start_hour_min = modle.tv_text.getText().toString();
                     } else {
                         //结束时间
                         Log.d("currentSelectDate4", currentSelectDate);
                         v_date_end.setText(currentSelectDate + " " + modle.tv_text.getText().toString());
-                    }
+                        end_hour_min = modle.tv_text.getText().toString();
 
+                    }
                 }
             }
         });
@@ -398,13 +402,12 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             d = day + "";
         }
         if (startDate) {
-            v_date_start.setText(yeas + "-" + m + "-" + d);
-            Log.d("Slide_date", yeas + "-" + month + "-" + day);
-            Log.d("Slide_date1", yeas + "-" + m + "-" + d);
+            v_date_start.setText(yeas + "-" + m + "-" + d + " " + start_hour_min);
+            Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + start_hour_min);
         } else {
-            v_date_end.setText(yeas + "-" + m + "-" + d);
+            v_date_end.setText(yeas + "-" + m + "-" + d + " " +end_hour_min);
+            Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + end_hour_min);
         }
-
     }
 
     /**