Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

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

@@ -382,8 +382,8 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener,
         for (int i = 0; i < 1; i++) {
             JSONObject temp=new JSONObject(true);
             temp.put("起始时间",et_extra_starttime.getText().toString());
-            temp.put("当天加班时数",et_extra_count.getText().toString());
             temp.put("截止时间",et_extra_endtime.getText().toString());
+            temp.put("当天加班时数",et_extra_count.getText().toString());
             detail.add(temp);
         }
         startActivity(new Intent(ct, FormDetailActivity.class)

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

@@ -15,7 +15,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
     //TODO  上一个发布版本是71
-    private static final int DATABASE_VERSION = 73;//数据库版本号(每添加一个表要增加版本号)
+    private static final int DATABASE_VERSION = 74;//数据库版本号(每添加一个表要增加版本号)
     public static String dataBaseName = "erp.db";//数据库名称
     public Context context;
 
@@ -51,6 +51,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
             db.execSQL(Constants.TABLE_MISSION);//外勤计划
             db.execSQL(Constants.WORK_LOCATION);//
             db.execSQL(Constants.EM_ERPNEWS);//
+            db.execSQL(Constants.CREATE_BANNER);//
         } catch (Exception e) {
 
         }
@@ -88,6 +89,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS workdata");
         db.execSQL("DROP TABLE IF EXISTS work_location");
         db.execSQL("DROP TABLE IF EXISTS em_erpnews");
+        db.execSQL("DROP TABLE IF EXISTS step");
     }
 
     /**

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

@@ -163,6 +163,13 @@ public class Constants {
             + "subs_img BLOB"
             + ")";
 
+
+    //用于创建Banner表
+    public  static final String CREATE_BANNER = "create table step ("
+            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + "curDate TEXT, "
+            + "totalSteps TEXT)";
+
     //已订阅号表
     public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "
             + "(id integer primary key autoincrement,"

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -593,14 +593,13 @@ public class FormDetailActivity extends BaseActivity {
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[0].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[0].toString());
                     } else if ("加班单详情".equals(doc_type)) {
-                        doc_detail_key.add("加班明细" + num);
-                        doc_detail_value.add("");
+                        doc_detail_key.add("加班明细" + num);doc_detail_value.add("");
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[0].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[0].toString());
-                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[1].toString());
-                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[1].toString());
                         doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[2].toString());
                         doc_detail_value.add(array.getJSONObject(i).values().toArray()[2].toString());
+                        doc_detail_key.add(array.getJSONObject(i).keySet().toArray()[1].toString());
+                        doc_detail_value.add(array.getJSONObject(i).values().toArray()[1].toString());
                     }
                 }
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/WorkPageActivity.java

@@ -177,9 +177,9 @@ public class WorkPageActivity extends BaseActivity implements RecognizerDialogLi
                 for (int i = 0; i < array.size(); i++) {
                     JSONObject model = array.getJSONObject(i);
                     JSONObject temp = new JSONObject(true);
-                    temp.put("起始时间", DateFormatUtil.getFormatDate(model.getLong("wod_startdate")));
-                    temp.put("截止时间", DateFormatUtil.getFormatDate(model.getLong("wod_enddate")));
                     temp.put("加班时长", model.get("wod_count"));
+                    temp.put("截止时间", DateFormatUtil.getFormatDate(model.getLong("wod_enddate")));
+                    temp.put("起始时间", DateFormatUtil.getFormatDate(model.getLong("wod_startdate")));
                     detail.add(temp);
 
                 }

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDataDao.java

@@ -35,8 +35,7 @@ public class StepDataDao {
         values.put("curDate", stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.insert("step", null, values);
-
-        stepDb.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 
     /**
@@ -59,8 +58,8 @@ public class StepDataDao {
             }
         }
         //关闭
-        stepDb.close();
         cursor.close();
+        DatabaseManager.getInstance().closeDatabase();
         return stepEntity;
     }
 
@@ -82,8 +81,8 @@ public class StepDataDao {
         }
 
         //关闭数据库
-        stepDb.close();
         cursor.close();
+        DatabaseManager.getInstance().closeDatabase();
         return dataList;
     }
 
@@ -100,7 +99,7 @@ public class StepDataDao {
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.update("step", values, "curDate=?", new String[]{stepEntity.getCurDate()});
 
-        stepDb.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 
 
@@ -114,6 +113,6 @@ public class StepDataDao {
 
         if (stepDb.isOpen())
             stepDb.delete("step", "curDate", new String[]{curDate});
-        stepDb.close();
+        DatabaseManager.getInstance().closeDatabase();
     }
 }