提交 b589c303 authored 作者: lgd's avatar lgd

1.修改质量反馈差异

2.//TODO ,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,坩埚下单,mes其他页面,mes质量反馈,编辑任务担当无法修改.支数参数,新建反馈-客户接口
上级 c01ee41e
...@@ -1747,12 +1747,19 @@ ...@@ -1747,12 +1747,19 @@
<activity <activity
android:name=".ui.activity.mes.quality.MesChooseProcessActivity" android:name=".ui.activity.mes.quality.MesChooseProcessActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
android:label=" " android:label="选择责任工序"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.quality.MesQualityChooseClientActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择客户"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.user.MesSupplierAddActivity" android:name=".ui.activity.mes.user.MesSupplierAddActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
......
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class QualityClientBean {
/**
* pageNum : 1
* pageSize : 10
* size : 10
* startRow : 1
* endRow : 10
* total : 390
* pages : 39
* list : [{"id":"04338cdf473411ea8334fa163e1166bd","createDateTime":1580809932000,"updateDateTime":1580809932000,"customerName":"222","englishName":"wwwy577","customerCode":"111","address":"w'w'w","telephone":"0000","delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"0f815f03473411ea8334fa163e1166bd","createDateTime":1580809951000,"updateDateTime":1580809951000,"customerName":"ddd","englishName":"d","customerCode":"rrr","address":"hh","telephone":"9090909","delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"18de26fe473411ea8334fa163e1166bd","createDateTime":1580809966000,"updateDateTime":1580809966000,"customerName":"21","englishName":null,"customerCode":"111","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"467a29a57f0011ea8334fa163e1166bd","createDateTime":1586944974000,"updateDateTime":1586944974000,"customerName":"测试","englishName":null,"customerCode":"CSBM001·","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"722c039e854411ea8334fa163e1166bd","createDateTime":1587633960000,"updateDateTime":1587633960000,"customerName":"cs001","englishName":null,"customerCode":"CS001","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"83dabc857efa11ea8334fa163e1166bd","createDateTime":1586942500000,"updateDateTime":1586942500000,"customerName":"测试001","englishName":null,"customerCode":"CSBM001","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"9fbbfee77eff11ea8334fa163e1166bd","createDateTime":1586944695000,"updateDateTime":1586944695000,"customerName":"测试","englishName":null,"customerCode":"CSBM002","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"b4be457c61b311ea8334fa163e1166bd","createDateTime":1583723504000,"updateDateTime":1583723504000,"customerName":"21","englishName":"12","customerCode":"12","address":null,"telephone":null,"delete":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello"},{"id":"KG00001","createDateTime":1574697600000,"updateDateTime":1586395507000,"customerName":"安徽创宇电力设备有限公司","englishName":"80445","customerCode":"KG00001","address":"","telephone":null,"delete":null,"createUserId":"SA","createUserName":null,"updateUserId":"SA","updateUserName":null},{"id":"KG00002","createDateTime":1574697600000,"updateDateTime":1586395507000,"customerName":"巴基斯坦","englishName":"80346","customerCode":"KG00002","address":"","telephone":null,"delete":null,"createUserId":"SA","createUserName":null,"updateUserId":"SA","updateUserName":null}]
* prePage : 0
* nextPage : 2
* isFirstPage : true
* isLastPage : false
* hasPreviousPage : false
* hasNextPage : true
* navigatePages : 8
* navigatepageNums : [1,2,3,4,5,6,7,8]
* navigateFirstPage : 1
* navigateLastPage : 8
* firstPage : 1
* lastPage : 8
*/
private int pageNum;
private int pageSize;
private int size;
private int startRow;
private int endRow;
private int total;
private int pages;
private int prePage;
private int nextPage;
private boolean isFirstPage;
private boolean isLastPage;
private boolean hasPreviousPage;
private boolean hasNextPage;
private int navigatePages;
private int navigateFirstPage;
private int navigateLastPage;
private int firstPage;
private int lastPage;
private List<ListBean> list;
private List<Integer> navigatepageNums;
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getStartRow() {
return startRow;
}
public void setStartRow(int startRow) {
this.startRow = startRow;
}
public int getEndRow() {
return endRow;
}
public void setEndRow(int endRow) {
this.endRow = endRow;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public int getPages() {
return pages;
}
public void setPages(int pages) {
this.pages = pages;
}
public int getPrePage() {
return prePage;
}
public void setPrePage(int prePage) {
this.prePage = prePage;
}
public int getNextPage() {
return nextPage;
}
public void setNextPage(int nextPage) {
this.nextPage = nextPage;
}
public boolean isIsFirstPage() {
return isFirstPage;
}
public void setIsFirstPage(boolean isFirstPage) {
this.isFirstPage = isFirstPage;
}
public boolean isIsLastPage() {
return isLastPage;
}
public void setIsLastPage(boolean isLastPage) {
this.isLastPage = isLastPage;
}
public boolean isHasPreviousPage() {
return hasPreviousPage;
}
public void setHasPreviousPage(boolean hasPreviousPage) {
this.hasPreviousPage = hasPreviousPage;
}
public boolean isHasNextPage() {
return hasNextPage;
}
public void setHasNextPage(boolean hasNextPage) {
this.hasNextPage = hasNextPage;
}
public int getNavigatePages() {
return navigatePages;
}
public void setNavigatePages(int navigatePages) {
this.navigatePages = navigatePages;
}
public int getNavigateFirstPage() {
return navigateFirstPage;
}
public void setNavigateFirstPage(int navigateFirstPage) {
this.navigateFirstPage = navigateFirstPage;
}
public int getNavigateLastPage() {
return navigateLastPage;
}
public void setNavigateLastPage(int navigateLastPage) {
this.navigateLastPage = navigateLastPage;
}
public int getFirstPage() {
return firstPage;
}
public void setFirstPage(int firstPage) {
this.firstPage = firstPage;
}
public int getLastPage() {
return lastPage;
}
public void setLastPage(int lastPage) {
this.lastPage = lastPage;
}
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public List<Integer> getNavigatepageNums() {
return navigatepageNums;
}
public void setNavigatepageNums(List<Integer> navigatepageNums) {
this.navigatepageNums = navigatepageNums;
}
public static class ListBean {
/**
* id : 04338cdf473411ea8334fa163e1166bd
* createDateTime : 1580809932000
* updateDateTime : 1580809932000
* customerName : 222
* englishName : wwwy577
* customerCode : 111
* address : w'w'w
* telephone : 0000
* delete : null
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : hello
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserName : hello
*/
private String id;
private long createDateTime;
private long updateDateTime;
private String customerName;
private String englishName;
private String customerCode;
private String address;
private String telephone;
private Object delete;
private String createUserId;
private String createUserName;
private String updateUserId;
private String updateUserName;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public long getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getEnglishName() {
return englishName;
}
public void setEnglishName(String englishName) {
this.englishName = englishName;
}
public String getCustomerCode() {
return customerCode;
}
public void setCustomerCode(String customerCode) {
this.customerCode = customerCode;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getTelephone() {
return telephone;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
}
}
...@@ -378,6 +378,13 @@ public interface MesApiService { ...@@ -378,6 +378,13 @@ public interface MesApiService {
*/ */
@POST("/himes/api/defectdict/show/page.json") @POST("/himes/api/defectdict/show/page.json")
Observable<BaseMesBean> defectList(@Query("functionId") String functionId, @Body RequestBody requestBody); Observable<BaseMesBean> defectList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 客户
*
* @return
*/
@POST("/himes/api/customer/show/page.json")
Observable<BaseMesBean> qualityClientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/** /**
* @return * @return
......
...@@ -218,6 +218,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity { ...@@ -218,6 +218,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
} }
private void submit() { private void submit() {
param.put("status","1");
RtfUtils.getMesRtf().feedbackAdd("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().feedbackAdd("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
......
package com.wd.workoffice.ui.activity.mes.quality;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.QualityClientBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesClientAdapter;
import com.wd.workoffice.ui.adapter.MesQualityClientAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 选择客户
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesQualityChooseClientActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<QualityClientBean.ListBean> clientList;
private MesQualityClientAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new MesQualityClientAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.pageMesKey();
param.put("pageNum", 1);
param.put("paramMap",paramMap);
getData();
}
private void getData() {
RtfUtils.getMesRtf().qualityClientList("1", 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<QualityClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), QualityClientBean.class).getList();
if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
clientAdapter.loadMoreComplete();
} else {
clientAdapter.loadMoreComplete();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
clientAdapter.loadMoreEnd();
} else {
page++;
}
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_take_on;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("customerName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
...@@ -59,7 +59,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity { ...@@ -59,7 +59,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class); FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id",data.getId()); param.put("id",data.getId());
param.put("status",3); param.put("status",4);
} }
private void submit() { private void submit() {
......
...@@ -167,27 +167,27 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -167,27 +167,27 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
case "1": case "1":
llClient.setVisibility(View.GONE); llClient.setVisibility(View.GONE);
llCompany.setVisibility(View.GONE); llCompany.setVisibility(View.GONE);
llManager.setVisibility(View.VISIBLE); llManager.setVisibility(View.GONE);
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
break; break;
case "2": case "2":
llClient.setVisibility(View.GONE); llClient.setVisibility(View.GONE);
llCompany.setVisibility(View.VISIBLE); llCompany.setVisibility(View.GONE);
llManager.setVisibility(View.VISIBLE); llManager.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
break; break;
case "3": case "3":
llClient.setVisibility(View.GONE);
llCompany.setVisibility(View.VISIBLE);
llManager.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.VISIBLE);
break;
case "4":
llClient.setVisibility(View.VISIBLE); llClient.setVisibility(View.VISIBLE);
llCompany.setVisibility(View.VISIBLE); llCompany.setVisibility(View.VISIBLE);
llManager.setVisibility(View.VISIBLE); llManager.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.GONE); llBottom.setVisibility(View.GONE);
break; break;
// case "4":
// llClient.setVisibility(View.VISIBLE);
// llCompany.setVisibility(View.VISIBLE);
// llManager.setVisibility(View.VISIBLE);
// llBottom.setVisibility(View.GONE);
// break;
} }
tvNo.setText(detailBean.getFeedbackCode()); tvNo.setText(detailBean.getFeedbackCode());
tvName.setText(detailBean.getCustomerName()); tvName.setText(detailBean.getCustomerName());
...@@ -241,9 +241,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity { ...@@ -241,9 +241,12 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean)); startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
break; break;
case "1": case "1":
startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean)); startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
break; break;
case "2": case "2":
startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
break;
case "3":
startActivity(MesQualityClientActivity.class,"data",JSON.toJSONString(detailBean)); startActivity(MesQualityClientActivity.class,"data",JSON.toJSONString(detailBean));
break; break;
} }
......
...@@ -85,7 +85,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -85,7 +85,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class); data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id", data.getId()); param.put("id", data.getId());
param.put("status",2); param.put("status",3);
} }
private void submit() { private void submit() {
...@@ -97,8 +97,6 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -97,8 +97,6 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
param.put("factoryAnalysis",tvFactoryReason.getText().toString()); param.put("factoryAnalysis",tvFactoryReason.getText().toString());
param.put("factoryImplement",tvFactoryStatus.getText().toString()); param.put("factoryImplement",tvFactoryStatus.getText().toString());
param.put("factoryLeaderOpinion",tvFactorySuggest.getText().toString()); param.put("factoryLeaderOpinion",tvFactorySuggest.getText().toString());
RtfUtils.getMesRtf().feedbackCheck("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().feedbackCheck("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
...@@ -153,7 +151,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -153,7 +151,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
public void onViewClicked(View view) { public void onViewClicked(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.rl_process: case R.id.rl_process:
startActivityForResult(MesChooseProcessActivity.class,10003,"id", data.getProductId()); startActivityForResult(MesChooseProcessActivity.class,10003,"id", data.getProductCode());
break; break;
case R.id.rl_duty_person: case R.id.rl_duty_person:
startActivityForResult(MesChooseMangerActivity.class,10001); startActivityForResult(MesChooseMangerActivity.class,10001);
...@@ -162,7 +160,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity { ...@@ -162,7 +160,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
startActivityForResult(MesChooseMangerActivity.class,10002); startActivityForResult(MesChooseMangerActivity.class,10002);
break; break;
case R.id.rl_question: case R.id.rl_question:
startActivityForResult(MesChooseQuestionActivity.class,10004,"id", data.getProductId()); startActivityForResult(MesChooseQuestionActivity.class,10004,"id", data.getProductCode());
break; break;
case R.id.rl_time: case R.id.rl_time:
PickTimeUtils.showPickThree(this, new OnTimeSelectListener() { PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
......
...@@ -77,7 +77,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity { ...@@ -77,7 +77,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class); FeedbackDetailBean data = JSON.parseObject(getIntent().getStringExtra("data"), FeedbackDetailBean.class);
param.put("id",data.getId()); param.put("id",data.getId());
param.put("status",1); param.put("status",2);
imgList=new ArrayList<>(); imgList=new ArrayList<>();
ImageBean imageBean = new ImageBean(); ImageBean imageBean = new ImageBean();
imageBean.setUri(null); imageBean.setUri(null);
......
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.QualityClientBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class MesQualityClientAdapter extends BaseQuickAdapter<QualityClientBean.ListBean, BaseViewHolder> {
public MesQualityClientAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, QualityClientBean.ListBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
}
}
...@@ -489,7 +489,6 @@ ...@@ -489,7 +489,6 @@
android:layout_marginBottom="30mm" android:layout_marginBottom="30mm"
android:background="@drawable/shape_input_white" android:background="@drawable/shape_input_white"
android:gravity="top" android:gravity="top"
android:hint="请输入"
android:minLines="4" android:minLines="4"
android:padding="5mm" android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -697,6 +696,7 @@ ...@@ -697,6 +696,7 @@
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
...@@ -723,6 +723,7 @@ ...@@ -723,6 +723,7 @@
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
......
...@@ -247,6 +247,7 @@ ...@@ -247,6 +247,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:visibility="gone"
android:id="@+id/rl_time" android:id="@+id/rl_time"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论