2016/8/31-2

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

@@ -388,7 +388,9 @@ public class BusinessDetailActivty extends BaseActivity {
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     progressDialog.dismiss();
                     ToastMessage("抢商机成功！");
-                    startActivity(new Intent(ct, BusinessActivity.class));
+                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, page = 1);
+//                    startActivity(new Intent(ct, BusinessActivity.class));
+//                    finish();
                     break;
                 case BUSINESS_FENPEI:
                     progressDialog.dismiss();
@@ -427,8 +429,8 @@ public class BusinessDetailActivty extends BaseActivity {
                 params.put("condition", "nvl(bc_status,' ')<>'已失效' and nvl(bc_doman,' ')=' ' and bc_nichehouse in (select bd_name from BusinessDataBase where bd_admincode=" +
                         "'" + CommonUtil.getSharedPreferences(ct, "erp_username") + "')");
             } else if (type == 3) {//商机列表
-                params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='"+
-                CommonUtil.getSharedPreferences(ct,"erp_username")+"'");
+                params.put("condition", "bc_currentprocess='" + business_steps + "' and bc_domancode='" +
+                        CommonUtil.getSharedPreferences(ct, "erp_username") + "'");
             } else {//跟进
                 params.put("condition", "(bc_type='公有' or nvl(bc_type,' ')=' ')");
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SigninClickFragment.java

@@ -437,14 +437,14 @@ public class SigninClickFragment extends EasyFragment implements View.OnClickLis
             //比较大小（在上班打卡时间和下班打卡时间之内）
             if (!StringUtils.isEmpty(b.startSignin) && !StringUtils.isEmpty(b.startSignin2) && str.compareTo(b.startSignin) > 0 && str.compareTo(b.startSignin2) < 0) {
                 //在该班次时间范围之内
-                ok = true;
-                break;
-//                if (StringUtils.isEmpty(b.time2) && str.compareTo(b.time2) > 0 && !(StringUtils.isEmpty(b.signin) || b.signin.length() <= 4)) {
-//                    //当前时间大于下班时间而且上班没有打过卡已经打卡过了，不能打卡
-//                } else {
-//                    ok = true;
-//                    break;
-//                }
+//                ok = true;
+//                break;
+                if (StringUtils.isEmpty(b.time2) && str.compareTo(b.time2) > 0 && !(StringUtils.isEmpty(b.signin) || b.signin.length() <= 4)) {
+                    //当前时间大于下班时间而且上班没有打过卡已经打卡过了，不能打卡
+                } else {
+                    ok = true;
+                    break;
+                }
             }
         }
         return ok;