本地提交

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

@@ -204,6 +204,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("选择时间");
         //getSupportActionBar().setSubtitle("只适合普通请假");
+        swichDateButton(true);
         Intent intent = getIntent();
         String startDate = "";
         String endDate = "";
@@ -211,8 +212,15 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             startDate = intent.getStringExtra("startDate");
             endDate = intent.getStringExtra("endDate");
             field = intent.getStringExtra("field");
+            
             isMenuShuffle=  intent.getBooleanExtra("hasMenu",false);
-            LogUtil.d("start:" + startDate + " end:" + endDate);
+            LogUtil.d("start:" + startDate + " end:" + endDate+" field:"+field);
+            if (!StringUtils.isEmpty(field)){
+                if (field.contains("end")||field.contains("date2")){
+                    //结束时间
+                    swichDateButton(false);
+                }
+            }
             id = intent.getIntExtra("id", 0);
             object = intent.getParcelableExtra("object");
             if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) {
@@ -307,7 +315,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         viewPager.setAdapter(pagerAdapter);
         viewPager.setCurrentItem(MAX_PAGER / 2);
 
-        swichDateButton(true);
+      
     }
 
 
@@ -414,7 +422,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         while(true){
             start=DateFormatUtil.add(DateFormatUtil.getDate4StrDate(start, "HH:mm"),
                     "HH:mm",1*1*30*60 * 1000);
-            if(start.compareTo(end)>0){
+            if(start.compareTo(end)>=0){
                 result.add(end);
                 break;
             }else{

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/FlexJsonUtil.java

@@ -26,6 +26,7 @@ public class FlexJsonUtil {
 		return new JSONDeserializer<Map<K, V>>().use(null, map.getClass()).deserialize(json);
 	}
 	
+	
 	public static <K, V> HashMap<K, V> fromHJson(String json) {
 		HashMap<K, V> map = new HashMap<K, V>();
 		return new JSONDeserializer<HashMap<K, V>>().use(null, map.getClass()).deserialize(json);
@@ -36,7 +37,7 @@ public class FlexJsonUtil {
 		LinkedHashMap<K, V> map = new LinkedHashMap<K, V>();
 		return new JSONDeserializer<LinkedHashMap<K, V>>().use(null, map.getClass()).deserialize(json);
 	}
-
+	
 	public String toJson() {
 		return new JSONSerializer().exclude("*.class").serialize(this);
 	}