1.修改bug

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceCheckDetailActivity.java

@@ -117,7 +117,10 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
 
     private void changeView() {
         tvNo.setText(info.getBillNum());
-        tvStatus.setText(info.getStatus() == 1 ? "已点检" : "未点检");
+        tvStatus.setText(info.getStatus() == 2 ? "待执行" : "已完成");
+        if (info.getStatus() != 2) {
+            llBottom.setVisibility(View.GONE);
+        }
         tvPerson.setText(info.getSpotCheckPersonName());
         tvNewPerson.setText(info.getCreateUserName());
         tvNewTime.setText(info.getCreateDateTime());
@@ -208,8 +211,8 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
                 startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId(),
-                        "info",JSON.toJSONString(info),
-                        "machine",JSON.toJSONString(dataList.get(i)),"type",getIntent().getStringExtra("type"));
+                        "info", JSON.toJSONString(info),
+                        "machine", JSON.toJSONString(dataList.get(i)), "type", getIntent().getStringExtra("type"));
             }
         });
     }
@@ -220,7 +223,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
         return R.layout.activity_mes_service_check_detail;
     }
 
-    @OnClick({R.id.tv_refuse, R.id.tv_agree,R.id.rl_true_star_time, R.id.rl_true_end_time})
+    @OnClick({R.id.tv_refuse, R.id.tv_agree, R.id.rl_true_star_time, R.id.rl_true_end_time})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.tv_refuse:
@@ -240,7 +243,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
 //                        param.put("pageNum", page);
 //                        getData();
                     }
-                }, false).show();
+                }, false).show(rlTrueStarTime);
                 break;
             case R.id.rl_true_end_time:
                 PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
@@ -253,7 +256,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
 //                        param.put("pageNum", page);
 //                        getData();
                     }
-                }, false).show();
+                }, false).show(rlTrueEndTime);
                 break;
         }
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceDetailActivity.java

@@ -13,6 +13,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.Config;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.ChangeStatus;
 import com.wd.workoffice.bean.mesBean.MesServiceBillBean;
 import com.wd.workoffice.bean.mesBean.ServiceBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -21,6 +22,8 @@ import com.wd.workoffice.ui.adapter.MesServiceDetailAdapter;
 import com.wd.workoffice.util.PickTimeUtils;
 import com.wd.workoffice.util.WorkUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -115,7 +118,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
     }
 
     private void changeView() {
-//        2待执行 3 已完成
+        //   1 待执行   2已完成
         tvNo.setText(info.getInspoCode());
         tvClose.setText(info.getStopWork() == 1 ? "是" : "否");
         tvStatus.setText(info.getStatus() == 2 ? "已完成" : "待执行");
@@ -267,7 +270,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
         Map<String, Object> param = WorkUtils.simpleParam();
         param.put("id", info.getId());
         param.put("inspoCode", info.getInspoCode());
-        param.put("status", 3);
+        param.put("status", 1);
         param.put("actualEndDateTime", info.getActualEndDateTime());
         param.put("actualStartDateTime", info.getActualStartDateTime());
         RtfUtils.getMesRtf().modinspoprojectUpdate("00d12c310f4411ea8334fa163e1166bd",
@@ -289,6 +292,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
+                EventBus.getDefault().post(new ChangeStatus());
                 toast("保存成功");
                 finish();
             }
@@ -321,6 +325,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
+                EventBus.getDefault().post(new ChangeStatus());
                 toast("保存成功");
                 finish();
             }

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardDetailActivity.java

@@ -6,6 +6,7 @@ import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -57,9 +58,9 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_failure_code)
     TextView tvFailureCode;
     @BindView(R.id.tv_desc)
-    TextView tvDesc;
+    EditText tvDesc;
     @BindView(R.id.tv_remark)
-    TextView tvRemark;
+    EditText tvRemark;
     @BindView(R.id.ll_status)
     LinearLayout llStatus;
     @BindView(R.id.tv_error)
@@ -70,7 +71,9 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
     private QMUIDialog.MenuDialogBuilder statusDialog;
     private String[] statusList = new String[]{"正常", "异常"};
     private Integer[] statusValue = new Integer[]{0, 1};//0正常 1异常
+    private Integer[] normalValue = new Integer[]{1, 0};//0异常 1正常
     private int chooseStatus;
+    private int chooseNormal;
 
     @Override
     protected void initView() {
@@ -88,6 +91,7 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
                 dialog.dismiss();
                 tvStatus.setText(statusList[which]);
                 chooseStatus = statusValue[which];
+                chooseNormal = normalValue[which];
                 if (canModify()) {
                     if (statusValue[which] == 1) {
                         llBottom.setVisibility(View.VISIBLE);
@@ -127,7 +131,7 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
             tvNumB.setText(MathUtils.converData(info.getNumB(), 3));
             tvNumC.setText(MathUtils.converData(info.getNumC(), 3));
             tvProcessStandard.setText(info.getProcessStandard());
-            if (!TextUtils.isEmpty(info.getStatus())){
+            if (!TextUtils.isEmpty(info.getStatus())) {
                 tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
             }
             if (canModify()) {
@@ -141,15 +145,15 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
             tvRemark.setText(info.getRemarks());
         } else {
             setTitle("检修标准");
-            tvDesc.setText(info.getInspoProDescription());
+            tvDesc.setText(info.getDescription());
             tvFailureCode.setText(info.getReportCode());
             tvMeasurementUnit.setText(info.getUint());
             tvNumA.setText(MathUtils.converData(info.getNumA(), 3));
             tvNumB.setText(MathUtils.converData(info.getNumB(), 3));
             tvNumC.setText(MathUtils.converData(info.getNumC(), 3));
             tvProcessStandard.setText(info.getProcessStandard());
-            if (!TextUtils.isEmpty(info.getStatus())){
-                tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+            if (!TextUtils.isEmpty(info.getNormal())) {
+                tvStatus.setText(TextUtils.equals(info.getNormal(), "0") ? "异常" : "正常");//1 异常 0正常
             }
             if (TextUtils.equals(info.getStatus(), "1")) {
                 llBottom.setVisibility(View.VISIBLE);
@@ -201,14 +205,16 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
 //        param.put("numB", "");
 //        param.put("numC", "");
         info.setStatus(chooseStatus + "");
-        info.setRemarks(tvRemark.getText().toString());
+        info.setNormal(chooseNormal + "");
         info.setFailureCode(tvFailureCode.getText().toString());
 //        WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))))
-        Observable<BaseMesBean> baseMesBeanObservable ;
+        Observable<BaseMesBean> baseMesBeanObservable;
         if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {
+            info.setRemarks(tvRemark.getText().toString());
             baseMesBeanObservable = RtfUtils.getMesRtf().spotCheckBillStandard("00d12c310f4411ea8334fa163e1166bd", 3,
                     WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))));
         } else {
+            info.setDescription(tvDesc.getText().toString());
             baseMesBeanObservable = RtfUtils.getMesRtf().modinspoproject("00d12c310f4411ea8334fa163e1166bd", 3,
                     WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))));
         }
@@ -269,19 +275,19 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
     }
 
     private boolean canModify() {
-        if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//点检
+        if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//点检//2待执行  3 已完成
             ServiceCheckBean.ListBean data = JSON.parseObject(getIntent().getStringExtra("data"), ServiceCheckBean.ListBean.class);//最外层
-            if (data.getStatus() == 3) {
+            if (data.getStatus() != null && 3 == data.getStatus()) {
                 return false;
             } else {
                 return true;
             }
         } else {
             ServiceBean.ListBean data = JSON.parseObject(getIntent().getStringExtra("data"), ServiceBean.ListBean.class);//最外层
-            if (data.getStatus() == 3) {
-                return false;
-            } else {
+            if (data.getStatus() != null && 1 == data.getStatus()) {//   1 待执行   2已完成
                 return true;
+            } else {
+                return false;
             }
         }
     }