1.修改点检和维修的问题

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

@@ -208,7 +208,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
             @Override
             public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
                 startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId(),
-                        "info",getIntent().getStringExtra("info"),
+                        "info",JSON.toJSONString(info),
                         "machine",JSON.toJSONString(dataList.get(i)),"type",getIntent().getStringExtra("type"));
             }
         });
@@ -259,6 +259,7 @@ public class ServiceCheckDetailActivity extends WorkToolBarActivity {
     }
 
     private void save() {
+        info.setStatus(2);
         RtfUtils.getMesRtf().spotCheckBillUpdate("00d12c310f4411ea8334fa163e1166bd",
                 WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info)))).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override

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

@@ -118,8 +118,8 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
 //        2待执行 3 已完成
         tvNo.setText(info.getInspoCode());
         tvClose.setText(info.getStopWork() == 1 ? "是" : "否");
-        tvStatus.setText(info.getStatus() == 3 ? "已完成" : "待执行");
-        if (info.getStatus() == 3) {
+        tvStatus.setText(info.getStatus() == 2 ? "已完成" : "待执行");
+        if (info.getStatus() == 2) {
             llBottom.setVisibility(View.GONE);
         }
         tvPerson.setText(info.getPrincipalName());
@@ -129,10 +129,10 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
         tvFactory.setText(info.getSiteDesc());
         tvRemark.setText(info.getDescription());
 
-        tvPlanStarTime.setText(info.getPlanStartDateTime());
-        tvPlanEndTime.setText(info.getPlanEndDateTime());
-//        tvChangeStarTime.setText(info.getAdjustBeginTime());
-//        tvChangeEndTime.setText(info.getAdjustEndTime());
+//        tvPlanStarTime.setText(info.getPlanStartDateTime());
+//        tvPlanEndTime.setText(info.getPlanEndDateTime());
+        tvChangeStarTime.setText(info.getAdjustBeginTime());
+        tvChangeEndTime.setText(info.getAdjustEndTime());
         tvTrueStarTime.setText(info.getActualStartDateTime());
         tvTrueEndTime.setText(info.getActualEndDateTime());
 
@@ -211,7 +211,8 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
             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", "1");
+                        "machine", JSON.toJSONString(dataList.get(i)), "type", "1"
+                ,_TITLE,"检修项目");
             }
         });
     }
@@ -233,10 +234,10 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
                 finishRequest();
                 break;
             case R.id.rl_true_star_time:
-                PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
+                PickTimeUtils.showPick(this, new OnTimeSelectListener() {
                     @Override
                     public void onTimeSelect(Date date, View view) {
-                        tvTrueStarTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("hh:mm:ss")));
+                        tvTrueStarTime.setText(TimeUtils.date2String(date));
                         info.setActualStartDateTime(tvTrueStarTime.getText().toString());
 
 //                        paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
@@ -244,20 +245,20 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
 //                        param.put("pageNum", page);
 //                        getData();
                     }
-                }, false).show();
+                }).show();
                 break;
             case R.id.rl_true_end_time:
-                PickTimeUtils.showPickTime(this, new OnTimeSelectListener() {
+                PickTimeUtils.showPick(this, new OnTimeSelectListener() {
                     @Override
                     public void onTimeSelect(Date date, View view) {
-                        tvTrueEndTime.setText(TimeUtils.date2String(date, new SimpleDateFormat("hh:mm:ss")));
+                        tvTrueEndTime.setText(TimeUtils.date2String(date));
                         info.setActualEndDateTime(tvTrueEndTime.getText().toString());
 //                        paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
 //                        page = 1;
 //                        param.put("pageNum", page);
 //                        getData();
                     }
-                }, false).show();
+                }).show();
                 break;
         }
     }
@@ -266,7 +267,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", 2);
+        param.put("status", 3);
         param.put("actualEndDateTime", info.getActualEndDateTime());
         param.put("actualStartDateTime", info.getActualStartDateTime());
         RtfUtils.getMesRtf().modinspoprojectUpdate("00d12c310f4411ea8334fa163e1166bd",
@@ -296,7 +297,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
 
     private void finishRequest() {
         Map<String, Object> param = WorkUtils.simpleParam();
-        param.put("status", "3");
+        param.put("status", "2");
         param.put("id", info.getId());
         param.put("inspoCode", info.getInspoCode());
         param.put("actualEndDateTime", info.getActualEndDateTime());

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

@@ -283,14 +283,31 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
     }
 
     private void save() {
+        if (TextUtils.isEmpty(tvName.getText().toString())) {
+            toast("请输入故障名称");
+            return;
+        }
+        if (chooseLevel == -1) {
+            toast("请选择故障等级");
+            return;
+        }
+        if (chooseFaultTypeBean == null) {
+            toast("请选择故障类");
+            return;
+        }
+        if (chooseFaultCode == null) {
+            toast("请选择问题代码");
+            return;
+        }
         Map<String, Object> param = WorkUtils.simpleParam();
-        param.put("phenomenonDescription", tvRemark.getText().toString());
+        param.put("phenomenonDescription", tvDesc.getText().toString());
         param.put("description", tvName.getText().toString());
         param.put("problemCode", chooseFaultCode.getFailureCode());
         param.put("problemDesc", chooseFaultCode.getDescription());
         param.put("problemId", chooseFaultCode.getId());
 //        param.put("projectId", info.getProjectId());
         param.put("assetStopDateTime", tvStopTime.getText().toString());
+        param.put("removeDateTime", tvRecoverTime.getText().toString());
         param.put("culevel", chooseLevel);
         param.put("remark", tvRemark.getText().toString());
         param.put("status", 1);
@@ -298,19 +315,19 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
         param.put("failureId", chooseFaultTypeBean.getId());
         param.put("failureDesc", chooseFaultTypeBean.getDescription());
         param.put("failureCode", chooseFaultTypeBean.getCode());
-        Observable<BaseMesBean> baseMesBeanObservable ;
-        if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {
+        Observable<BaseMesBean> baseMesBeanObservable;
+        if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//点检
             param.put("siteId", data.getSiteId());
             param.put("siteDesc", data.getSiteName());
             param.put("assetId", machine.getAssetId());
             param.put("assetDesc", machine.getAssetName());
             param.put("assetCode", machine.getAssetCode());
-            param.put("locaCode", machine.getLocationId());
+            param.put("locaCode", machine.getLocationCode());
             param.put("locaDesc", machine.getLocationName());
-            param.put("locationId", data.getLocationId());
-            baseMesBeanObservable = RtfUtils.getMesRtf().spotCheckBillStandard("00d12c310f4411ea8334fa163e1166bd", 3,
+            param.put("locationId", machine.getLocationId());
+            baseMesBeanObservable = RtfUtils.getMesRtf().opmreporterror("00d12c310f4411ea8334fa163e1166bd", 3,
                     WorkUtils.convertMapToBody(param));
-            param.put("failureCode", chooseFaultTypeBean.getCode());
+//            param.put("failureCode", chooseFaultTypeBean.getCode());
         } else {
             //最外层
             param.put("siteId", dataService.getSiteId());
@@ -324,10 +341,8 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
             param.put("locationId", dataService.getLocationId());
             baseMesBeanObservable = RtfUtils.getMesRtf().opmreporterror("00d12c310f4411ea8334fa163e1166bd", 3,
                     WorkUtils.convertMapToBody(param));
-            param.put("reportCode", chooseFaultTypeBean.getCode());
+//            param.put("reportCode", chooseFaultTypeBean.getCode());
         }
-
-
         baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
@@ -356,14 +371,23 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.ll_time, R.id.ll_level, R.id.ll_fault_type, R.id.ll_fault_code})
+    @OnClick({R.id.ll_recover_time, R.id.ll_time, R.id.ll_level, R.id.ll_fault_type, R.id.ll_fault_code})
     public void onClick(View view) {
         switch (view.getId()) {
+            case R.id.ll_recover_time:
+                PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
+                        tvRecoverTime.setText(time);
+                    }
+                }).show();
+                break;
             case R.id.ll_time:
                 PickTimeUtils.showPick(this, new OnTimeSelectListener() {
                     @Override
                     public void onTimeSelect(Date date, View v) {
-                        String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"));
+                        String time = TimeUtils.date2String(date);
                         tvStopTime.setText(time);
                     }
                 }).show();
@@ -392,14 +416,14 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
             case 10001:
                 if (requestCode == 10001 && resultCode == 10001) {
                     chooseFaultTypeBean = JSON.parseObject(data.getStringExtra("data"), FaultTypeBean.ListBean.class);
-                    tvFaultType.setText(chooseFaultTypeBean.getFailureCode());
+                    tvFaultType.setText(chooseFaultTypeBean.getDescription());
                 }
 
                 break;
             case 10002:
                 if (resultCode == 10001) {
                     chooseFaultCode = JSON.parseObject(data.getStringExtra("data"), FaultTypeBean.ListBean.class);
-                    tvFaultCode.setText(chooseFaultCode.getFailureCode());
+                    tvFaultCode.setText(chooseFaultCode.getDescription());
                 }
                 break;
             case 10003:

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

@@ -32,6 +32,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -126,7 +127,9 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
             tvNumB.setText(MathUtils.converData(info.getNumB(), 3));
             tvNumC.setText(MathUtils.converData(info.getNumC(), 3));
             tvProcessStandard.setText(info.getProcessStandard());
-            tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+            if (!TextUtils.isEmpty(info.getStatus())){
+                tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+            }
             if (canModify()) {
                 if (TextUtils.equals(info.getStatus(), "1")) {
                     llBottom.setVisibility(View.VISIBLE);
@@ -137,6 +140,7 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
 
             tvRemark.setText(info.getRemarks());
         } else {
+            setTitle("检修标准");
             tvDesc.setText(info.getInspoProDescription());
             tvFailureCode.setText(info.getReportCode());
             tvMeasurementUnit.setText(info.getUint());
@@ -144,7 +148,9 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
             tvNumB.setText(MathUtils.converData(info.getNumB(), 3));
             tvNumC.setText(MathUtils.converData(info.getNumC(), 3));
             tvProcessStandard.setText(info.getProcessStandard());
-            tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+            if (!TextUtils.isEmpty(info.getStatus())){
+                tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+            }
             if (TextUtils.equals(info.getStatus(), "1")) {
                 llBottom.setVisibility(View.VISIBLE);
             } else {
@@ -198,8 +204,15 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
         info.setRemarks(tvRemark.getText().toString());
         info.setFailureCode(tvFailureCode.getText().toString());
 //        WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))))
-        RtfUtils.getMesRtf().spotCheckBillStandard("00d12c310f4411ea8334fa163e1166bd", 3,
-                WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info)))).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        Observable<BaseMesBean> baseMesBeanObservable ;
+        if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {
+            baseMesBeanObservable = RtfUtils.getMesRtf().spotCheckBillStandard("00d12c310f4411ea8334fa163e1166bd", 3,
+                    WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))));
+        } else {
+            baseMesBeanObservable = RtfUtils.getMesRtf().modinspoproject("00d12c310f4411ea8334fa163e1166bd", 3,
+                    WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))));
+        }
+        baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }