1.电子合同 订单判断更改

app/src/main/java/com/webrain/happywork/bean/OrderBean.java

@@ -29,6 +29,7 @@ public class OrderBean {
     private String money;
     private CompanyBean hwPlatformCompany;
     private String serviceStage;
+    private int workContractType;
 
     public String getId() {
         return id;
@@ -222,6 +223,14 @@ public class OrderBean {
         this.serviceStage = serviceStage;
     }
 
+    public int getWorkContractType() {
+        return workContractType;
+    }
+
+    public void setWorkContractType(int workContractType) {
+        this.workContractType = workContractType;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof OrderBean) {

app/src/main/java/com/webrain/happywork/ui/adapter/listview/MineOrderListAdapter.java

@@ -124,7 +124,7 @@ public class MineOrderListAdapter extends BaseListAdapter<OrderBean, MineOrderLi
         public void onClick(View view) {
             switch (view.getId()) {
                 case R.id.tv_check_order:
-                    if(orderBean.getContractType()==2){
+                    if(orderBean.getWorkContractType()==1){
                         ((MineOrderListActivity) mContext).mvpPresenter.requestOrderSign(orderBean);
                     }else{
                         ((MineOrderListActivity) mContext).mvpPresenter.requestOrderSure(orderBean);

app/src/main/java/com/webrain/happywork/ui/mvp/presenter/MineOrderDetailPresenter.java

@@ -73,7 +73,7 @@ public class MineOrderDetailPresenter extends BasePresenter<MineOrderDetailActiv
     @Override
     public void requestOrder() {
         if (isViewAttach() && mMineOrderDetailModel.isValidity(false))
-            if (mMineOrderDetailModel.getOrderBean().getContractType() == 2) {
+            if (mMineOrderDetailModel.getOrderBean().getWorkContractType() == 1) {
                 requestOrderSign();
             } else {
                 requestOrderSure();

app/src/main/java/com/webrain/happywork/ui/mvp/presenter/MineOrderListPresenter.java

@@ -107,9 +107,6 @@ public class MineOrderListPresenter extends BasePresenter<MineOrderListActivity>
                 @Override
                 public void onData(String data) {
                     if (isViewAttach() && !TextUtils.isEmpty(data)) {
-//                        Uri uri = Uri.parse(data);
-//                        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-//                        mvpReference.get().startActivity(intent);
                         Intent intent = new Intent(mvpReference.get(), FDDWebViewActivity.class);
                         intent.putExtra(IntentConstant.URL, data);
                         mvpReference.get().startActivity(intent);