Browse Source

318,之前的

FANGLH 9 years ago
parent
commit
11b796671d

+ 27 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/PlatWDdetailyActivity.java

@@ -24,6 +24,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.MyListView;
@@ -43,6 +44,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
     private static final int RESUBMIT_OF_DELETEAPPFL = 3092;
     private static final int DELETE_OF_DELETEAPPFL = 3093;
     public static final int DELETE_SUCCEED = 1219;
+    private static final int PLAT_APP_FLOW_NODES = 0x318;
     @ViewInject(R.id.work_daily_detail_time_tv)
     private TextView wdd_date;
     @ViewInject(R.id.work_daily_detail_summary_tv)
@@ -155,12 +157,31 @@ public class PlatWDdetailyActivity extends BaseActivity {
         if(!TextUtils.isEmpty(mCaller)&&mkeyValue!= -1){
            progressDialog.dismiss();
             //TODO 请求获取审批流数据
+            if (MyApplication.getInstance().isNetworkActive()){
+                loadPlatAppFlow(mCaller,mkeyValue);
+            }else {
+                ToastMessage(getResources().getString(R.string.networks_out));
+            }
+
         }else{
             approval_flowlv.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);
         }
 
     }
+
+    private void loadPlatAppFlow(String mCaller, int mkeyValue) {
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_app_flow_nodes;
+        Map<String,Object> param = new HashMap<>();
+        param.put("id",mkeyValue);
+        param.put("caller",mCaller);
+        param.put("enuu", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")).longValue());
+        param.put("emcode",Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, PLAT_APP_FLOW_NODES, null, null, "get");
+
+    }
+
     private void clickEvent() {
         resanddel_ll.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -245,6 +266,12 @@ public class PlatWDdetailyActivity extends BaseActivity {
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             switch (msg.what){
+                case PLAT_APP_FLOW_NODES:
+                    if (msg.getData() != null){
+                        String app_flow_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("app_flow_result",app_flow_result);
+                    }
+                    break;
                 case RESUBMIT_OF_DELETEAPPFL:
 
                     break;

+ 3 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/WorkDailyAddActivity.java

@@ -241,6 +241,8 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
                         }
                     }, 500);
                     break;
+
+
                 // 以下为平台部分
                 case B2B_DAILY_SUBMITTED:  // 初次日报提交成功
                     if (msg.getData() != null){
@@ -743,7 +745,7 @@ public class WorkDailyAddActivity extends BaseActivity implements RecognizerDial
         if(MyApplication.getInstance().isNetworkActive()){
             showsubmitDialog();
         }else {
-            ToastMessage("网络未连接!");
+            ToastMessage(getResources().getString(R.string.networks_out));
         }
     }
 

+ 9 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiBase.java

@@ -72,6 +72,15 @@ public abstract class ApiBase {
     public String update_work_daily;//更新日报
     public String getdaily_list; //获取日报列表
 
+    public String common_app_flow_nodes;//单据获取审批流节点数据
+
+    public String getCommon_app_flow_nodes() {
+        return common_app_flow_nodes;
+    }
+
+    public void setCommon_app_flow_nodes(String common_app_flow_nodes) {
+        this.common_app_flow_nodes = common_app_flow_nodes;
+    }
 
     public void setGetOutAddress(String getOutAddress) {
         this.getOutAddress = getOutAddress;

+ 4 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -52,6 +52,8 @@ public class ApiPlatform extends ApiBase implements ApiModel {
     private String UPDATE_WORK_DAILY_URL = mBaseUrl + "/workDaily/updateWorkDaily";
     private String GETDAILY_LIST_URL = mBaseUrl + "/workDaily/getWorkDaily";
 
+    private String COMMON_APP_FLOW_NODES = mBaseUrl + "/approvalflow/getNodesAndLog";
+
     public ApiPlatform() {
         //这里开始写接口
         setLogin(url_login_test);
@@ -103,6 +105,8 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         setDelete_work_daily(DELETE_WORK_DAILY_URL);  //删除日报
         setUpdate_work_daily(UPDATE_WORK_DAILY_URL); //更新日报
         setGetdaily_list(GETDAILY_LIST_URL); //获取日报列表
+
+        setCommon_app_flow_nodes(COMMON_APP_FLOW_NODES); //单据获取审批流节点数据
     }