保存处理b2b接口数据

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/WorkModelDao.java

@@ -134,7 +134,6 @@ public class WorkModelDao {
      * @return
      */
     public long clearByDate(long date) {
-        Log.i("gongpengming","date="+TimeUtils.s_long_2_str(date));
         if (date <= 0) return -1;
         SQLiteDatabase db = null;
         long i = 0;

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

@@ -540,8 +540,10 @@ public class TaskActivity extends BaseActivity {
         mparams.put("pageSize", "100");
         mparams.put("_noc", "1");
         String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
+        String erp_emid = CommonUtil.getSharedPreferences(context, "erp_emid");
+        String condition = "(ra_statuscode='UNCONFIRMED' and recorderid='" + erp_emid + "') or (ra_resourcecode='"+em_code+"' and ra_statuscode='START') and nvl(class,' ')<>'projecttask'";
         if ("START".equals(status))
-            mparams.put("condition", "ra_resourcecode='" + em_code + "' and (ra_statuscode='UNCONFIRMED' or ra_statuscode='START') and nvl(class,' ')<>'projecttask'");
+            mparams.put("condition", condition);
         else
             mparams.put("condition", "ra_resourcecode='" + em_code + "' and ra_statuscode='" + status + "'" + " and nvl(class,' ')<>'projecttask'");
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MsgsSecondCommonActivity.java

@@ -50,6 +50,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static android.R.attr.id;
+
 /**
  * Created by FANGlh on 2017/2/24.
  * function: 消息第二层 通用界面
@@ -331,7 +333,6 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
                 return false;
             }
         });
-
     }
 
 
@@ -340,8 +341,8 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
             baseUrl = CommonUtil.getSharedPreferences(mContext, "erp_baseurl");
             String url = baseUrl + "mobile/message/getDetail.action";
             Intent intent_web = new Intent(mContext, WebViewCommActivity.class);
-            intent_web.putExtra("url", url);
-            intent_web.putExtra("id", msg_id);
+            intent_web.putExtra("url", url + "?id=" + msg_id);
+//            intent_web.putExtra("id", msg_id);
             intent_web.putExtra("title", msg_title);
             startActivityForResult(intent_web, MSG_MARKED_READED);
         } else {
@@ -382,7 +383,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
         setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
             @Override
             public void onDismiss() {
-                    closePopupWindow();
+                closePopupWindow();
             }
         });
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectDepartmentActivity.java

@@ -74,6 +74,7 @@ public class SelectDepartmentActivity extends OABaseActivity implements HttpHand
         setContentView(R.layout.activity_select_department);
         ViewUtils.inject(this);
         rl_empty.setVisibility(View.GONE);
+        mumber_tv.setText("已选择 0 个部门");
         initData();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -21,9 +21,12 @@ public class DBOpenHelper extends SQLiteOpenHelper {
 
     private static DBOpenHelper mInstance;
 
-    public synchronized static DBOpenHelper getInstance() {
+    public static DBOpenHelper getInstance() {
         if (mInstance == null) {
-            mInstance = new DBOpenHelper(MyApplication.getInstance());
+            synchronized (DBOpenHelper.class) {
+                if (mInstance == null)
+                    mInstance = new DBOpenHelper(MyApplication.getInstance());
+            }
         }
         return mInstance;
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java

@@ -443,6 +443,10 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
             o = array.getJSONObject(i);
             if (o.containsKey("workdatename") && !StringUtils.isEmpty(o.getString("workdatename"))
                     && o.containsKey("em_name") && !StringUtils.isEmpty(o.getString("em_name"))) {
+                String workdatecode = o.getString("workdatecode");
+                if (isUpdate && model != null && !StringUtils.isEmpty(model.getCode()) && !StringUtils.isEmpty(workdatecode) && model.getCode().equals(workdatecode)) {
+                    continue;
+                }
                 user = new SelectEmUser();
                 user.setClick(true);
                 user.setDepart(o.getString("em_defaultorname"));
@@ -468,11 +472,9 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
         ArrayList<SelectEmUser> chche = new ArrayList<>();
         for (int i = 0; i < array.size(); i++) {
             o = array.getJSONObject(i);
-            if (o.containsKey("workdatesname") && !StringUtils.isEmpty(o.getString("workdatesname"))
-                    && o.containsKey("conflictem_defaultorcode") && !StringUtils.isEmpty(o.getString("conflictem_defaultorcode"))
-                    ) {
-                String workdatecode = o.getString("workdatecode");
-                if (isUpdate && model != null && !StringUtils.isEmpty(model.getCode()) && !StringUtils.isEmpty(workdatecode) && model.getCode().equals(workdatecode)) {
+            String workdatecode = OACheckUtil.getJson2Text(o, "workdatescode");
+            if (!StringUtils.isEmpty(workdatecode) && !StringUtils.isEmpty(OACheckUtil.getJson2Text(o, "workdatesname")) && !StringUtils.isEmpty(OACheckUtil.getJson2Text(o, "conflictem_defaultorcode"))) {
+                if (isUpdate && model != null && !StringUtils.isEmpty(model.getCode()) && model.getCode().equals(workdatecode)) {
                     continue;
                 }
                 user = new SelectEmUser();
@@ -483,6 +485,7 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
                 user.setWorkName(o.getString("workdatesname"));
                 user.setImId(0);
                 chche.add(user);
+
             }
         }
         iAddFlihtsView.showCollisionDefaultir(chche);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MessagePresenter.java

@@ -142,7 +142,7 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
 
     private void loadB2bNewsCount() {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getTaskCounts;
-        HttpHandler.getInstance().loadB2BByNet(LOAD_B2B_COUNT, url, new HashMap<String, Object>(), null, this,"get");
+        HttpHandler.getInstance().loadB2BByNet(LOAD_B2B_COUNT, url, new HashMap<String, Object>(), null, this, "get");
     }
 
 
@@ -179,7 +179,9 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         param.put("pageSize", 100);
         param.put("caller", "ResourceAssignment");
         String em_code = CommonUtil.getSharedPreferences(ct, "erp_username");
-        param.put("condition", "ra_resourcecode='" + em_code + "' and (ra_statuscode='UNCONFIRMED' or ra_statuscode='START') and nvl(class,' ')<>'projecttask'");
+        String erp_emid = CommonUtil.getSharedPreferences(ct, "erp_emid");
+        String condition = "(ra_statuscode='UNCONFIRMED' and recorderid='" + erp_emid + "') or (ra_resourcecode='"+em_code+"' and ra_statuscode='START') and nvl(class,' ')<>'projecttask'";
+        param.put("condition", condition);
         HttpHandler.getInstance().loadERPByNet(LOAD_TASK, "common/datalist/data.action",
                 param, null, this, "get");
     }