master 汇众分支代码 arisono

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

@@ -12,7 +12,9 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
@@ -33,24 +35,46 @@ public class AddLogActivity extends BaseActivity {
     private EditText plan_tv;
     private EditText learned_tv;
     private TextView type_tv;
-
     private boolean imOk = false;
     private boolean erpOk = false;
+    private boolean isSbmit = false;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            if (0x11 == msg.what) {
-                imOk = true;
-                if (erpOk) {
-                    setResult(0x22, new Intent());
-                    finish();
-                }
-            } else if (0x12 == msg.what) {
-                erpOk = true;
-                if (imOk) {
-                    setResult(0x22, new Intent());
-                    finish();
-                }
+            switch (msg.what) {
+                case 0x11:
+                    imOk = true;
+                    if (erpOk) {
+                        setResult(0x22, new Intent());
+                        isSbmit = false;
+                        finish();
+                    }
+                    break;
+                case 0x12:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            String message = msg.getData().getString("result");
+                            if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
+                                Toast.makeText(ct, "工作日报提交成功", Toast.LENGTH_SHORT).show();
+                                erpOk = true;
+                                if (imOk) {
+                                    isSbmit = false;
+                                    setResult(0x22, new Intent());
+                                    finish();
+                                }
+                            } else {
+                                Crouton.makeText(ct, "工作日报提交失败");
+                            }
+                        }
+                    }
+                    break;
+                default:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            ToastMessage(msg.getData().getString("result"));
+                        }
+                    }
+                    break;
             }
         }
     };
@@ -103,6 +127,9 @@ public class AddLogActivity extends BaseActivity {
     }
 
     private void sendAble() {
+        if (isSbmit) {
+            return;
+        }
         StringBuilder builder = new StringBuilder();
         builder.append(type_tv.getText().toString() + ":\n");
         if (sum_tv.getText().toString().length() > 0) {
@@ -123,8 +150,9 @@ public class AddLogActivity extends BaseActivity {
             Crouton.makeText(ct, R.string.add_learned);
             return;
         }
-        sendWorkLog(builder.deleteCharAt(builder.length() - 1).toString());
+        isSbmit = true;
         sendWorkLogByErp(sum_tv.getText().toString());
+        sendWorkLog(builder.deleteCharAt(builder.length() - 1).toString());
     }
 
     /**

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

@@ -11,6 +11,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.B2BMsg;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.Hrorgs;
 import com.xzjmyk.pm.activity.ui.erp.entity.HrorgsEntity;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -93,25 +94,27 @@ public class DBManager {
         db.beginTransaction();
         for (int i = 0; i < hrorgsList.size(); i++) {
             HrorgsEntity entity = hrorgsList.get(i);
-            sta.bindString(1, entity.getOr_code() == null ? "" : entity.getOr_code());
-            sta.bindString(2, entity.getWhichsys());
+            sta.bindString(1, getStringNotNull(entity.getOr_code()));
+            sta.bindString(2, getStringNotNull(entity.getWhichsys()));
             sta.bindLong(3, entity.getOr_subof());
-            sta.bindString(4, entity.getCompany());
+            sta.bindString(4, getStringNotNull(entity.getCompany()));
             sta.bindLong(5, entity.getOr_isleaf());
-            sta.bindString(6, entity.getOr_name());
+            sta.bindString(6, getStringNotNull(entity.getOr_name()));
             sta.bindLong(7, entity.getOr_id());
-            sta.bindString(8, entity.getFlag());
-            sta.bindString(9, entity.getOr_headmanname() == null ? "" : entity.getOr_headmanname());
-            sta.bindString(10, entity.getOr_headmancode() == null ? "" : entity.getOr_headmancode());
+            sta.bindString(8, getStringNotNull(entity.getFlag()));
+            sta.bindString(9, getStringNotNull(entity.getOr_headmanname()));
+            sta.bindString(10, getStringNotNull(entity.getOr_headmancode()));
             sta.bindLong(11, entity.getOr_remark());
             sta.executeInsert();
         }
-
         db.setTransactionSuccessful();
         db.endTransaction();
         //db.close();
     }
 
+    private String getStringNotNull(String chche) {
+        return StringUtils.isEmpty(chche) ? "" : chche;
+    }
 
     public void updateHrogrRemark(int or_id, int or_remark, String master) {
         String sql = "update hrorgs"
@@ -481,8 +484,8 @@ public class DBManager {
     /**************************************************************************
      * ************* 未订阅表AllSubs操作  ***************************************
      *************************************************************************/
-    public void saveToAllSubs(SubscriptionNumber subscriptionNumber) {
-        String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username,subs_removed) values (?,?,?,?,?,?,?,?)";
+  /*  public void saveToAllSubs(SubscriptionNumber subscriptionNumber) {
+        String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username) values (?,?,?,?,?,?,?)";
         SQLiteStatement sqLiteStatement = db.compileStatement(saveSql);
         sqLiteStatement.bindLong(1, subscriptionNumber.getId());
         sqLiteStatement.bindString(2, subscriptionNumber.getTitle());
@@ -493,14 +496,15 @@ public class DBManager {
         sqLiteStatement.bindString(7, subscriptionNumber.getUsername());
         sqLiteStatement.bindLong(8, subscriptionNumber.getRemoved());
         sqLiteStatement.execute();
-    }
+    }*/
 
+   
     public void saveListToAllSubs(List<SubscriptionNumber> subscriptionNumbers){
         String saveSql = "replace into AllSubs(subs_id,subs_title,subs_kind,subs_status,subs_type,subs_master,subs_username,subs_removed) values (?,?,?,?,?,?,?,?)";
         SQLiteStatement sqLiteStatement = db.compileStatement(saveSql);
         for (int i = 0; i < subscriptionNumbers.size(); i++) {
             SubscriptionNumber subscriptionNumber = subscriptionNumbers.get(i);
-            sqLiteStatement.bindLong(1,subscriptionNumber.getId());
+            sqLiteStatement.bindLong(1, subscriptionNumber.getId());
             sqLiteStatement.bindString(2, subscriptionNumber.getTitle());
             sqLiteStatement.bindString(3, subscriptionNumber.getKind());
             sqLiteStatement.bindLong(4, subscriptionNumber.getStatus());
@@ -512,7 +516,7 @@ public class DBManager {
         }
     }
 
-    public List<SubscriptionNumber> queryFromAllSubs(String[] selectionArgs, String selection){
+    public List<SubscriptionNumber> queryFromAllSubs(String[] selectionArgs, String selection) {
         List<SubscriptionNumber> subscriptionNumbers = new ArrayList<SubscriptionNumber>();
         String table = "AllSubs";
         String groupBy = null;
@@ -567,14 +571,14 @@ public class DBManager {
         }
     }
 
-    public void deleteFromAllSubs(SubscriptionNumber subscriptionNumber) {
+  /*  public void deleteFromAllSubs(SubscriptionNumber subscriptionNumber) {
         String table = "AllSubs";
         String[] whereArgs = {String.valueOf(subscriptionNumber.getId()), subscriptionNumber.getMaster(), subscriptionNumber.getUsername()};
         String whereClause = "subs_id=? and subs_master=? and subs_username=? ";
         db.delete(table, whereClause, whereArgs);
-    }
+    }*/
 
-    public void deleteListFromAllSubs(List<SubscriptionNumber> subscriptionNumbers){
+ /*   public void deleteListFromAllSubs(List<SubscriptionNumber> subscriptionNumbers){
         for (int i = 0; i < subscriptionNumbers.size(); i++) {
             SubscriptionNumber subscriptionNumber = subscriptionNumbers.get(i);
             String table = "AllSubs";
@@ -582,17 +586,18 @@ public class DBManager {
             String whereClause = "subs_id=? and subs_master=? and subs_username=? ";
             db.delete(table, whereClause, whereArgs);
         }
-    }
+    }*/
+
     //删除当前账号当前账套的所有订阅
-    public void deleteMasterAllSubs(String master, String username){
+    public void deleteMasterAllSubs(String master, String username) {
         String table = "AllSubs";
-        String[] whereArgs = {master,username};
+        String[] whereArgs = {master, username};
         String whereClause = "subs_master=? and subs_username=? ";
         db.delete(table, whereClause, whereArgs);
     }
 
     /**************************************************************************
-     ************** 已订阅表MySubs操作  ***************************************
+     * ************* 已订阅表MySubs操作  ***************************************
      *************************************************************************/
     public void saveToMySubs(PersonalSubscriptionBean personalSubscriptionBean) {
         String saveSql = "replace into MySubs(subs_id,subs_title,subs_kind,subs_type,subs_applied,subs_master,subs_username) values (?,?,?,?,?,?,?)";
@@ -603,11 +608,11 @@ public class DBManager {
         sqLiteStatement.bindString(4, personalSubscriptionBean.getTYPE());
         sqLiteStatement.bindLong(5, personalSubscriptionBean.getISAPPLED());
         sqLiteStatement.bindString(6, personalSubscriptionBean.getMASTER());
-        sqLiteStatement.bindString(7,personalSubscriptionBean.getUSERNAME());
+        sqLiteStatement.bindString(7, personalSubscriptionBean.getUSERNAME());
         sqLiteStatement.execute();
     }
 
-    public void saveListToMySubs(List<PersonalSubscriptionBean> personalSubscriptionBeans){
+    public void saveListToMySubs(List<PersonalSubscriptionBean> personalSubscriptionBeans) {
         String saveSql = "replace into MySubs(subs_id,subs_title,subs_kind,subs_type,subs_applied,subs_master,subs_username) values (?,?,?,?,?,?,?)";
         SQLiteStatement sqLiteStatement = db.compileStatement(saveSql);
         for (int i = 0; i < personalSubscriptionBeans.size(); i++) {
@@ -618,12 +623,12 @@ public class DBManager {
             sqLiteStatement.bindString(4, personalSubscriptionBean.getTYPE());
             sqLiteStatement.bindLong(5, personalSubscriptionBean.getISAPPLED());
             sqLiteStatement.bindString(6, personalSubscriptionBean.getMASTER());
-            sqLiteStatement.bindString(7,personalSubscriptionBean.getUSERNAME());
+            sqLiteStatement.bindString(7, personalSubscriptionBean.getUSERNAME());
             sqLiteStatement.execute();
         }
     }
 
-    public List<PersonalSubscriptionBean> queryFromMySubs(String[] selectionArgs, String selection){
+    public List<PersonalSubscriptionBean> queryFromMySubs(String[] selectionArgs, String selection) {
         List<PersonalSubscriptionBean> personalSubscriptionBeans = new ArrayList<PersonalSubscriptionBean>();
         String table = "MySubs";
         String groupBy = null;
@@ -647,7 +652,7 @@ public class DBManager {
     }
 
 
-    public void updateMySubs(PersonalSubscriptionBean personalSubscriptionBean) {
+  /*  public void updateMySubs(PersonalSubscriptionBean personalSubscriptionBean) {
         String sql = "update MySubs"
                 + " set subs_applied=?"
                 + " where subs_id=? and subs_master=? and subs_username=? ;";
@@ -657,7 +662,7 @@ public class DBManager {
         sta.bindString(3, personalSubscriptionBean.getMASTER());
         sta.bindString(4, personalSubscriptionBean.getUSERNAME());
         sta.executeInsert();
-    }
+    }*/
 
     public void deleteFromMySubs(PersonalSubscriptionBean personalSubscriptionBean) {
         String table = "MySubs";
@@ -666,7 +671,7 @@ public class DBManager {
         db.delete(table, whereClause, whereArgs);
     }
 
-    public void deleteListFromMySubs(List<PersonalSubscriptionBean> personalSubscriptionBeans){
+    /*public void deleteListFromMySubs(List<PersonalSubscriptionBean> personalSubscriptionBeans){
         for (int i = 0; i < personalSubscriptionBeans.size(); i++) {
             PersonalSubscriptionBean personalSubscriptionBean = personalSubscriptionBeans.get(i);
             String table = "MySubs";
@@ -674,7 +679,7 @@ public class DBManager {
             String whereClause = "subs_id=? and subs_master=? and subs_username=? ";
             db.delete(table, whereClause, whereArgs);
         }
-    }
+    }*/
 
     public void deleteMasterMySubs(String master, String username){
         String table = "MySubs";