Skip to content

W
workoffice
提交 db657130 authored 作者: lgd's avatar lgd
浏览文件
操作

1.点检查详情 

2.TODO 点维修详情测试+单独菜单
上级 2066239d
显示空白字符变更
内嵌 并排
正在显示 包含 130 行增加 和 14 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/ServiceStandardBean.java
浏览文件 @ db657130
......@@ -90,6 +90,33 @@ public class ServiceStandardBean extends BaseMesPageBean {
private String changeby;
private String failureCode;
private String astFailurelist;
private String inspoProDescription;
private String reportCode;
private String uint;
public String getInspoProDescription() {
return inspoProDescription;
}
public void setInspoProDescription(String inspoProDescription) {
this.inspoProDescription = inspoProDescription;
}
public String getReportCode() {
return reportCode;
}
public void setReportCode(String reportCode) {
this.reportCode = reportCode;
}
public String getUint() {
return uint;
}
public void setUint(String uint) {
this.uint = uint;
}
public String getId() {
return id;
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ db657130
......@@ -587,7 +587,11 @@ public interface MesApiService {
@POST("/himes/api/spotCheckBill/show/spotCheckBillStandard/page.json")
Observable<BaseMesBean> spotCheckStandardList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/modinspo/show/modinspoproject/modinspoprojectline/list.json")
Observable<BaseMesBean> serviceStandardList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceDetailActivity.java
浏览文件 @ db657130
package com.wd.workoffice.ui.activity.mes.repair;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -13,7 +12,6 @@ import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.MesServiceBillBean;
import com.wd.workoffice.bean.mesBean.ServiceBean;
import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesServiceDetailAdapter;
......@@ -31,6 +29,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 维修详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......@@ -168,7 +167,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId());
startActivity(ServiceStandardActivity.class, "id", dataList.get(i).getId(),"type","1");
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardActivity.java
浏览文件 @ db657130
package com.wd.workoffice.ui.activity.mes.repair;
import android.text.TextUtils;
import android.view.View;
import com.alibaba.fastjson.JSON;
......@@ -9,6 +10,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
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.mesBean.ServiceStandardBean;
import com.wd.workoffice.retrofit.RtfUtils;
......@@ -55,17 +57,24 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new MesServiceStandardAdapter(R.layout.item_mes_service_standard, dataList);
dataAdapter = new MesServiceStandardAdapter(R.layout.item_mes_service_standard, dataList, getIntent().getStringExtra("type"));
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageMesKey();
Map<String, Object> paramMap = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
paramMap.put("projectId", getIntent().getStringExtra("id"));
param.put("pageNum", page);
if (!TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//维修
paramMap.put("inspoProId", getIntent().getStringExtra("id"));
getServiceData();
} else {
paramMap.put("projectId", getIntent().getStringExtra("id"));
getData();
}
}
private void getData() {
RtfUtils.getMesRtf().spotCheckStandardList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
......@@ -97,7 +106,7 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
if (getList.size() < Config.SIZE) {
dataAdapter.loadMoreEnd();
} else {
page++;
......@@ -107,6 +116,46 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
}
private void getServiceData() {
RtfUtils.getMesRtf().serviceStandardList("afb5fde8eb1c11e98334fa163e1166bd", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<ServiceStandardBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ServiceStandardBean.class).getList();
if (page == 1) {
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() < Config.SIZE) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(new OnRefreshListener() {
......@@ -114,21 +163,30 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1;
param.put("pageNum", 1);
if (!TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//维修
getServiceData();
} else {
getData();
}
}
});
dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
if (!TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//维修
getServiceData();
} else {
getData();
}
}
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
startActivity(ServiceStandardDetailActivity.class, "info", JSON.toJSONString(dataList.get(i)));
startActivity(ServiceStandardDetailActivity.class, "info", JSON.toJSONString(dataList.get(i)),
"type", getIntent().getStringExtra("type"));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardDetailActivity.java
浏览文件 @ db657130
......@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
import com.wd.workoffice.util.MathUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
......@@ -51,16 +52,27 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
}
private void changeView() {
if (TextUtils.isEmpty(getIntent().getStringExtra("type"))){
tvDesc.setText(info.getDescription());
tvFailureCode.setText(info.getFailureCode());
tvMeasurementUnit.setText(info.getMeasurementUnit());
tvNumA.setText(info.getNumA());
tvNumB.setText(info.getNumB());
tvNumC.setText(info.getNumC());
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());
tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
tvRemark.setText(info.getRemarks());
}else {
tvDesc.setText(info.getInspoProDescription());
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());
tvStatus.setText(TextUtils.equals(info.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
tvRemark.setText(info.getRemarks());
}
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/MesServiceStandardAdapter.java
浏览文件 @ db657130
......@@ -16,18 +16,34 @@ import java.util.List;
*/
public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardBean.ListBean, BaseViewHolder> {
String type;
public MesServiceStandardAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
public MesServiceStandardAdapter(int layoutResId, List data, String type) {
super(layoutResId, data);
this.type = type;
}
@Override
protected void convert(BaseViewHolder helper, ServiceStandardBean.ListBean item) {
helper.setText(R.id.tv_name, String.format("检查项目:%s",item.getCheckProject()));
helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(),"1")?"异常":"正常");//1 异常 0正常
if (TextUtils.isEmpty(type)){
helper.setText(R.id.tv_name, String.format("检查项目:%s", item.getCheckProject()));
helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
helper.setText(R.id.tv_content1, item.getProcessStandard());
helper.setText(R.id.tv_content2, item.getMeasurementUnit());
helper.setText(R.id.tv_content3, item.getFailureCode());
}else {
helper.setText(R.id.tv_name, String.format("检查项目:%s", item.getInspoProDescription()));
helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
helper.setText(R.id.tv_content1, item.getProcessStandard());
helper.setText(R.id.tv_content2, item.getUint());
helper.setText(R.id.tv_content3, item.getReportCode());
}
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论