提交类型 修复bug

提交内容  处理外勤等界面在选择时间弹框弹出来的时候没有选择时间的情况下出现  时大约24的情况

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -105,9 +105,9 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-//        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.243:8080/ERP/";
-//        }
+        if (BaseConfig.isDebug()){
+            baseUrl="http://192.168.253.35:8080/ERP/";
+        }
 //        baseUrl = "http://192.168.253.41:8080/ERP/";
 
         return baseUrl;

app_core/common/src/main/java/com/core/utils/time/wheel/DateTimePicker.java

@@ -10,6 +10,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 
+import com.common.LogUtil;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -177,7 +179,7 @@ public class DateTimePicker extends WheelPicker {
             yearTextView.setVisibility(View.GONE);
         }
 
-        if (mode == YEAR_MONTH_DAY){
+        if (mode == YEAR_MONTH_DAY) {
             hourView.setVisibility(View.GONE);
             minuteView.setVisibility(View.GONE);
             hourTextView.setVisibility(View.GONE);
@@ -396,9 +398,16 @@ public class DateTimePicker extends WheelPicker {
      * @param minute
      */
     public void setSelectedItem(int year, int month, int day, int hour, int minute) {
+        LogUtil.i("gong", "hour=" + hour);
         selectedYearIndex = findItemIndex(years, year);
         selectedMonthIndex = findItemIndex(months, month);
         selectedDayIndex = findItemIndex(days, day);
+        if (hour > 24) {
+            hour = 0;
+        }
+        if (minute > 60) {
+            minute = 0;
+        }
         if (hour < 10) {
             selectedHour = "0" + String.valueOf(hour);
         } else {

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionActivity.java

@@ -291,7 +291,7 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
 	public void showDateDialog() {
 		DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
 		picker.setRange(2010, 2030);
-		picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay(), CalendarUtil.getMinute(), CalendarUtil.getSecond());
+		picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay(), CalendarUtil.getHour(), CalendarUtil.getMinute());
 		picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
 			@Override
 			public void onDateTimePicked(String year, String month, String day, String hour, String minute) {