2016/9/14 发布版本

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/TaskAddActivity.java

@@ -25,6 +25,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
+import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
@@ -369,9 +370,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.tv_date_start:
-//                showDialog(tv_date_start, true);
                 showDateDialog(true);
-//                showDateDialog((FormEditText) v.findViewById(R.id.tv_date_start));
                 break;
             case R.id.tv_date:
                 if (tv_date_start.getText() != null && tv_date_start.getText().toString().length() > 0) {
@@ -426,8 +425,10 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
         if (requestCode == 0x11 && resultCode == 0x11) {
-            ArrayList<Employees> list = data.getParcelableExtra("data");
+            ArrayList<Employees> list = data.getParcelableArrayListExtra("data");
+            Log.i("gongpengming", "onActivityResult");
             if (ListUtils.isEmpty(list)) return;
+            Log.i("gongpengming", "部位0");
             StringBuilder str = new StringBuilder();
             for (Employees e : list) {
                 str.append("," + e.getEm_name());

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/wheel/DateTimePicker.java

@@ -396,9 +396,9 @@ public class DateTimePicker extends WheelPicker {
             selectedHour = String.valueOf(hour);
         }
         if (minute < 10) {
-            selectedMinute = "0" + String.valueOf(hour);
+            selectedMinute = "0" + String.valueOf(minute);
         } else {
-            selectedMinute = String.valueOf(hour);
+            selectedMinute = String.valueOf(minute);
         }
     }