修改审批流代码备份

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

@@ -8,6 +8,7 @@ import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.activity.ui.erp.model.MessageModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -137,7 +138,7 @@ public class MessageDao {
      * @param isReaded
      * @return
      */
-    public boolean upStatus(int id, boolean isReaded) {
+    public boolean upStatus(int id, String type, boolean isReaded) {
         SQLiteDatabase db = null;
         long i = 0;
         try {
@@ -145,6 +146,7 @@ public class MessageDao {
             String emcode = CommonUtil.getEmcode();
             if (StringUtils.isEmpty(master) || StringUtils.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
+            db.beginTransaction();
             ContentValues values = new ContentValues();
             values.put("isReaded", isReaded ? 1 : 0);
             String readTime = TimeUtils.f_long_2_str(System.currentTimeMillis());
@@ -155,6 +157,24 @@ public class MessageDao {
             }
             String[] whereArgs = {master, emcode, String.valueOf(id)};
             i = db.update(TABLE_NAME, values, where, whereArgs);
+            //更新完成后，查看最后一条状态
+            if (!StringUtils.isEmpty(type)) {
+                String select = "master=? and emcode=? and type=? and hierarchy=? and isReaded= 0";
+                String[] selectArgs = {master, emcode, type, String.valueOf(0)};
+                String[] columns = {"subTitle"};
+                Cursor c = db.query(TABLE_NAME, columns, select, selectArgs, null, null, "time desc");
+                String subTitle = "";
+                if (c.moveToFirst())
+                    subTitle = c.getString(c.getColumnIndex("subTitle"));
+                c.close();
+                LogUtil.d("subTitle=" + subTitle);
+                values.put("subTitle", subTitle);
+                where = "master=? and emcode=? and type=? and hierarchy=?";
+                String[] whereArgs2 = {master, emcode, type, String.valueOf(0)};
+                db.update(TABLE_NAME, values, where, whereArgs2);
+            }
+            db.setTransactionSuccessful();
+            db.endTransaction();
         } catch (Exception e) {
 
         } finally {
@@ -229,6 +249,10 @@ public class MessageDao {
             String where = "master=? and emcode=? and type=?";
             String[] whereArgs = {master, emcode, type};
             i = db.update(TABLE_NAME, values, where, whereArgs);
+            values.put("subTitle", "");
+            where = "master=? and emcode=? and type=? and hierarchy=?";
+            String[] whereArgs2 = {master, emcode, type, String.valueOf(0)};
+            db.update(TABLE_NAME, values, where, whereArgs2);
         } catch (Exception e) {
         } finally {
             if (db != null)

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

@@ -422,7 +422,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
         Log.d("322msg_id",msg_id + ":" + url);
 //        } else {
             msgModel.get(mPosition).setReaded(true);
-            MessageDao.getInstance().upStatus(msg_id, true);//点击保存本地为已读状态操作
+            MessageDao.getInstance().upStatus(msg_id,msg_type, true);//点击保存本地为已读状态操作
             msgAdapter.notifyDataSetChanged();
 //        }
     }
@@ -503,7 +503,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
 
     private void doMarkUnReadMsg() {
         msgModel.get(mPosition).setReaded(false);
-        MessageDao.getInstance().upStatus(msg_id, false); //标为未读保存本地
+        MessageDao.getInstance().upStatus(msg_id, msg_type,false); //标为未读保存本地
         msgAdapter.notifyDataSetChanged();
 
 //        MessageDao.getInstance().upStatusByType(msg_type,false);
@@ -512,7 +512,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
 
     private void doMarkReadedMsg() {
         msgModel.get(mPosition).setReaded(true);
-        MessageDao.getInstance().upStatus(msg_id, true); //标为已读保存本地
+        MessageDao.getInstance().upStatus(msg_id,msg_type, true); //标为已读保存本地
         msgAdapter.notifyDataSetChanged();
     }
 
@@ -529,7 +529,7 @@ public class MsgsSecondCommonActivity extends BaseActivity implements View.OnCli
         try {
             if (requestCode == MSG_MARKED_READED && resultCode == 22 && data != null) {
                 msgModel.get(mPosition).setReaded(true);
-                MessageDao.getInstance().upStatus(msg_id, true);//点击保存本地为已读状态操作
+                MessageDao.getInstance().upStatus(msg_id, msg_type,true);//点击保存本地为已读状态操作
                 msgAdapter.notifyDataSetChanged();
             }
 

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

@@ -44,6 +44,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.OABean;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
@@ -385,7 +386,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 JSONObject object = array.getJSONObject(i);
                 Intent intent = null;
                 if (adapter.isTask(object)) {
-                    intent = new Intent(ct, TaskDetailB2BActivity.class);
+                    if (isB2b)
+                        intent = new Intent(ct, TaskDetailB2BActivity.class);
+                    else intent = new Intent(ct, DetailTaskActivity.class);
                     intent.putExtra("description", OACheckUtil.getJson2Text(object, "department", "detail"));
                     intent.putExtra("isMe", isMe);
                     intent.putExtra("duration", OACheckUtil.getJson2Text(object, "department", "detail"));
@@ -884,7 +887,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 break;
             case R.id.outoffice:  //外勤签到
                 boolean is = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
-                if (isB2b || is ) {
+                if (isB2b || is) {
                     intent = new Intent(activity, MissionActivity.class);
                     intent.putExtra("flag", 1);
                 } else {

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

@@ -708,7 +708,7 @@ public class ViewUtil {
         } else if (phone.equals("15012345676")) {
             return "品质";
         } else if (phone.equals("15012345678")) {
-            return "移动测试员";
+            return "邓国超移动";
         }
         return userName;
     }

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

@@ -751,7 +751,7 @@ public class MessagePresenter implements HttpHandler.OnResultListener {
         else
             intent.putExtra("readTime", friend.getPhone());
         ct.startActivity(intent);
-        MessageDao.getInstance().upStatus(friend.get_id(), true);
+        MessageDao.getInstance().upStatus(friend.get_id(), friend.getDescription(), true);
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskDetailB2BActivity.java

@@ -365,7 +365,7 @@ public class TaskDetailB2BActivity extends BaseActivity implements View.OnClickL
 
     public void sendDataToServer(String url, Map<String, Object> param, int what) {
 //		progressDialog.show();
-        Log.i(TAG, url);
+
         param.put("sessionId", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());