Skip to content

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

1.详情数据展示 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 96d92c4c
显示空白字符变更
内嵌 并排
正在显示 包含 493 行增加 和 383 行删除
app/src/main/java/com/wd/workoffice/app/WorkApp.java
浏览文件 @ d7c8b8d5
...@@ -26,7 +26,7 @@ import okhttp3.Request; ...@@ -26,7 +26,7 @@ import okhttp3.Request;
public class WorkApp extends BaseApp { public class WorkApp extends BaseApp {
private static Application instance; private static Application instance;
// private static DaoSession daoSession;
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
...@@ -41,8 +41,8 @@ public class WorkApp extends BaseApp { ...@@ -41,8 +41,8 @@ public class WorkApp extends BaseApp {
RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> { RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> {
Request original = chain.request(); Request original = chain.request();
Request request = original.newBuilder() Request request = original.newBuilder()
.header("Authorization", "Bearer "+UserKeeper.getInstance().getToken()) .header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
.header("userId",UserKeeper.getInstance().getUserId()) .header("userId", UserKeeper.getInstance().getUserId())
.method(original.method(), original.body()) .method(original.method(), original.body())
.build(); .build();
...@@ -51,7 +51,7 @@ public class WorkApp extends BaseApp { ...@@ -51,7 +51,7 @@ public class WorkApp extends BaseApp {
RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> { RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
Request original = chain.request(); Request original = chain.request();
Request request = original.newBuilder() Request request = original.newBuilder()
.header("Cookie", "SESSION=1f01ac55-973d-44c8-ac99-c9b990d454b1") .header("Cookie", "SESSION=ca4aabe3-4ef2-479e-b315-6238899edaa8")
.method(original.method(), original.body()) .method(original.method(), original.body())
.build(); .build();
......
app/src/main/java/com/wd/workoffice/bean/mesBean/JobTypeBean.java 0 → 100644
浏览文件 @ d7c8b8d5
package com.wd.workoffice.bean.mesBean;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class JobTypeBean {
/**
* id : 6
* jobTypeCode : 02
* jobTypeName : 新产品实验
* jobTypeContentCode : 02001
* jobTypeContentName : 试验产品
* orderId : 21
* createUserId : null
* createUserName : null
* createDateTime : 2020-03-25 11:10:30
* updateUserId : null
* updateUserName : null
* updateDateTime : 2020-03-25 11:10:30
* remark : null
* delete : null
*/
private int id;
private String jobTypeCode;
private String jobTypeName;
private String jobTypeContentCode;
private String jobTypeContentName;
private int orderId;
private Object createUserId;
private Object createUserName;
private String createDateTime;
private Object updateUserId;
private Object updateUserName;
private String updateDateTime;
private Object remark;
private Object delete;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getJobTypeCode() {
return jobTypeCode;
}
public void setJobTypeCode(String jobTypeCode) {
this.jobTypeCode = jobTypeCode;
}
public String getJobTypeName() {
return jobTypeName;
}
public void setJobTypeName(String jobTypeName) {
this.jobTypeName = jobTypeName;
}
public String getJobTypeContentCode() {
return jobTypeContentCode;
}
public void setJobTypeContentCode(String jobTypeContentCode) {
this.jobTypeContentCode = jobTypeContentCode;
}
public String getJobTypeContentName() {
return jobTypeContentName;
}
public void setJobTypeContentName(String jobTypeContentName) {
this.jobTypeContentName = jobTypeContentName;
}
public int getOrderId() {
return orderId;
}
public void setOrderId(int orderId) {
this.orderId = orderId;
}
public Object getCreateUserId() {
return createUserId;
}
public void setCreateUserId(Object createUserId) {
this.createUserId = createUserId;
}
public Object getCreateUserName() {
return createUserName;
}
public void setCreateUserName(Object createUserName) {
this.createUserName = createUserName;
}
public String getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Object updateUserId) {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
public String getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(String updateDateTime) {
this.updateDateTime = updateDateTime;
}
public Object getRemark() {
return remark;
}
public void setRemark(Object remark) {
this.remark = remark;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/TicketBean.java
浏览文件 @ d7c8b8d5
package com.wd.workoffice.bean.mesBean; package com.wd.workoffice.bean.mesBean;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesPageBean; import com.wd.workoffice.app.BaseMesPageBean;
import java.util.List; import java.util.List;
...@@ -12,31 +11,9 @@ import java.util.List; ...@@ -12,31 +11,9 @@ import java.util.List;
**/ **/
public class TicketBean extends BaseMesPageBean { public class TicketBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 10
* startRow : 1
* endRow : 10
* total : 10
* pages : 1
* list : [{"id":"31a39e1f757811ea8334fa163e1166bd","createDateTime":1585896967000,"updateDateTime":1585896967000,"woCode":"GD20040300002","description":"123","locationId":"29bda088516711ea8334fa163e1166bd","assetId":"9daab57f312d11ea8334fa163e1166bd","parentId":"f8227db26ce511ea8334fa163e1166bd","failureCodeId":"c6386c6e103011ea8334fa163e1166bd","questionId":"8ba92b1d8a8f41aeb83cd44b23a44bdc","workType":1,"woType":1,"status":1,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":true,"shutdownTime":1585670400000,"recoveryTime":1585670400000,"grant":true,"materiel":true,"detailedInformation":"2","schedStart":null,"schedFinish":null,"actStart":null,"actFinish":null,"pmCode":null,"standardOperation":null,"delete":false,"createBy":"398c852b38e911ea8334fa163e1166bd","changeBy":null,"failureCode":"F00033","failureName":"第二次测试","questionCode":"P00081","questionName":"儿子","parentCode":"GD20032300001","parentName":"dd","locationCode":"HWHWHWHWHW","locationName":null,"assetCode":"02990018","assetName":"坩埚制料生产线","siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":"GD20032300001","createName":"hello","procId":null,"approved":null},{"id":"f8227db26ce511ea8334fa163e1166bd","createDateTime":1584954555000,"updateDateTime":1585032200000,"woCode":"GD20032300001","description":"dd","locationId":"29bda088516711ea8334fa163e1166bd","assetId":"0bf86c16650511ea8334fa163e1166bd","parentId":null,"failureCodeId":"7df75c37650911ea8334fa163e1166bd","questionId":null,"workType":1,"woType":1,"status":1,"siteId":"053910b6311511ea8334fa163e1166bd","shutDown":true,"shutdownTime":1584979200000,"recoveryTime":1585324800000,"grant":true,"materiel":true,"detailedInformation":null,"schedStart":1584374400000,"schedFinish":1584806400000,"actStart":1584201600000,"actFinish":1584374400000,"pmCode":null,"standardOperation":null,"delete":false,"createBy":"398c852b38e911ea8334fa163e1166bd","changeBy":"398c852b38e911ea8334fa163e1166bd","failureCode":"F00009","failureName":"123","questionCode":null,"questionName":null,"parentCode":null,"parentName":null,"locationCode":"HWHWHWHWHW","locationName":null,"assetCode":"11213","assetName":"222","siteCode":"ZWXS02","siteName":"销售二公司（GK）","linkedNumberId":null,"linkedNumber":"GD20020100001","createName":"hello","procId":null,"approved":null},{"id":"9f4fa8f9757311ea8334fa163e1166bd","createDateTime":1585895004000,"updateDateTime":1585895004000,"woCode":"GD20040300001","description":"ffgg","locationId":"29bda088516711ea8334fa163e1166bd","assetId":"33c3f50f74af11ea8334fa163e1166bd","parentId":"f8227db26ce511ea8334fa163e1166bd","failureCodeId":"7df75c37650911ea8334fa163e1166bd","questionId":null,"workType":1,"woType":1,"status":4,"siteId":"053910b6311511ea8334fa163e1166bd","shutDown":true,"shutdownTime":1585756800000,"recoveryTime":1585843200000,"grant":true,"materiel":true,"detailedInformation":"e","schedStart":null,"schedFinish":null,"actStart":null,"actFinish":null,"pmCode":null,"standardOperation":null,"delete":false,"createBy":"398c852b38e911ea8334fa163e1166bd","changeBy":null,"failureCode":"F00009","failureName":"123","questionCode":null,"questionName":null,"parentCode":"GD20032300001","parentName":"dd","locationCode":"HWHWHWHWHW","locationName":null,"assetCode":null,"assetName":null,"siteCode":"ZWXS02","siteName":"销售二公司（GK）","linkedNumberId":null,"linkedNumber":"GD20032300001","createName":"hello","procId":null,"approved":null},{"id":"65dd1a8144bf11ea8334fa163e1166bd","createDateTime":1580539942000,"updateDateTime":1581930404000,"woCode":"GD20020100001","description":"此工单由故障管理生成","locationId":"18c6ed3005e911ea8334fa163e1166bd","assetId":"9b31b29e102811ea8334fa163e1166bd","parentId":"1df694bf808711ea8334fa163e1166bd","failureCodeId":"c6386c6e103011ea8334fa163e1166bd","questionId":null,"workType":null,"woType":null,"status":2,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":false,"shutdownTime":1574265600000,"recoveryTime":1574179200000,"grant":false,"materiel":false,"detailedInformation":null,"schedStart":null,"schedFinish":null,"actStart":null,"actFinish":null,"pmCode":null,"standardOperation":null,"delete":false,"createBy":"398c852b38e911ea8334fa163e1166bd","changeBy":"398c852b38e911ea8334fa163e1166bd","failureCode":"F00033","failureName":"第二次测试","questionCode":null,"questionName":null,"parentCode":"GD20041700001","parentName":"此工单由故障管理生成","locationCode":null,"locationName":null,"assetCode":null,"assetName":null,"siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":null,"createName":"hello","procId":null,"approved":null},{"id":"9e66b6e474bd11ea8334fa163e1166bd","createDateTime":1585816834000,"updateDateTime":1585816834000,"woCode":"GD20040200001","description":"此工单由故障管理生成","locationId":"18c6ed3005e911ea8334fa163e1166bd","assetId":"9b31b29e102811ea8334fa163e1166bd","parentId":null,"failureCodeId":"c6386c6e103011ea8334fa163e1166bd","questionId":null,"workType":null,"woType":null,"status":1,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":false,"shutdownTime":1585559495000,"recoveryTime":1585559495000,"grant":false,"materiel":false,"detailedInformation":null,"schedStart":null,"schedFinish":null,"actStart":null,"actFinish":null,"pmCode":null,"standardOperation":null,"delete":false,"createBy":"398c852b38e911ea8334fa163e1166bd","changeBy":null,"failureCode":"F00033","failureName":"第二次测试","questionCode":null,"questionName":null,"parentCode":null,"parentName":null,"locationCode":null,"locationName":null,"assetCode":null,"assetName":null,"siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":null,"createName":"hello","procId":null,"approved":null},{"id":"0727517afad911e98334fa163e1166bd","createDateTime":1572414564000,"updateDateTime":1572414564000,"woCode":"GD19102300001","description":"2","locationId":"61c80cd705e511ea8334fa163e1166bd","assetId":"41ea5c72807311ea8334fa163e1166bd","parentId":"","failureCodeId":"7e29f2bb37a911e8b81100163e049447","questionId":"60693011e0d411e98334fa163e1166bd","workType":2,"woType":2,"status":2,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":true,"shutdownTime":1294720882000,"recoveryTime":1294721062000,"grant":true,"materiel":true,"detailedInformation":"2","schedStart":1294720882000,"schedFinish":1294720882000,"actStart":1294720882000,"actFinish":1294720882000,"pmCode":"1","standardOperation":"1","delete":false,"createBy":"5ad1918b9ed911e8b81100163e049447","changeBy":"5ad1918b9ed911e8b81100163e049447","failureCode":null,"failureName":null,"questionCode":null,"questionName":null,"parentCode":null,"parentName":null,"locationCode":null,"locationName":null,"assetCode":"0808051001","assetName":"h设备名","siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":"743fc1d0fade11e98334fa163e1166bd","linkedNumber":null,"createName":"ADMIN","procId":null,"approved":null},{"id":"0ad0cd5eec0411e98334fa163e1166bd","createDateTime":1570783771000,"updateDateTime":1570785135000,"woCode":"GD19102300001","description":"2","locationId":"61c80cd705e511ea8334fa163e1166bd","assetId":"41ea5c72807311ea8334fa163e1166bd","parentId":"","failureCodeId":"7e29f2bb37a911e8b81100163e049447","questionId":"60693011e0d411e98334fa163e1166bd","workType":2,"woType":2,"status":2,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":false,"shutdownTime":1294720882000,"recoveryTime":1294721062000,"grant":false,"materiel":false,"detailedInformation":"2","schedStart":1294720882000,"schedFinish":1294720882000,"actStart":1294720882000,"actFinish":1294720882000,"pmCode":"1","standardOperation":"1","delete":false,"createBy":"5ad1918b9ed911e8b81100163e049447","changeBy":"5ad1918b9ed911e8b81100163e049447","failureCode":null,"failureName":null,"questionCode":null,"questionName":null,"parentCode":null,"parentName":null,"locationCode":null,"locationName":null,"assetCode":"0808051001","assetName":"h设备名","siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":null,"createName":"ADMIN","procId":null,"approved":null},{"id":"2d432b72ebc911e98334fa163e1166bd","createDateTime":1570758489000,"updateDateTime":1570775947000,"woCode":"2","description":"2","locationId":"03185e46e9ae11e98334fa163e1166bd","assetId":"9daab57f312d11ea8334fa163e1166bd","parentId":"","failureCodeId":"7e29f2bb37a911e8b81100163e049447","questionId":"60693011e0d411e98334fa163e1166bd","workType":2,"woType":2,"status":2,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":false,"shutdownTime":1294720882000,"recoveryTime":1294721062000,"grant":false,"materiel":false,"detailedInformation":"2","schedStart":1294720882000,"schedFinish":1294720882000,"actStart":1294720882000,"actFinish":1294720882000,"pmCode":"1","standardOperation":"1","delete":false,"createBy":"5ad1918b9ed911e8b81100163e049447","changeBy":"5ad1918b9ed911e8b81100163e049447","failureCode":null,"failureName":null,"questionCode":null,"questionName":null,"parentCode":null,"parentName":null,"locationCode":null,"locationName":null,"assetCode":"02990018","assetName":"坩埚制料生产线","siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":null,"createName":"ADMIN","procId":null,"approved":null},{"id":"1df694bf808711ea8334fa163e1166bd","createDateTime":1587112839000,"updateDateTime":1587113094000,"woCode":"GD20041700001","description":"此工单由故障管理生成","locationId":"9635e4e3311011ea8334fa163e1166bd","assetId":"9daab57f312d11ea8334fa163e1166bd","parentId":"f8227db26ce511ea8334fa163e1166bd","failureCodeId":"8c0d58e7808611ea8334fa163e1166bd","questionId":"9c474ccc8b264dcbac1561eb86b686be","workType":1,"woType":1,"status":1,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":false,"shutdownTime":1585670400000,"recoveryTime":1586275200000,"grant":false,"materiel":false,"detailedInformation":"1","schedStart":null,"schedFinish":null,"actStart":null,"actFinish":null,"pmCode":null,"standardOperation":null,"delete":false,"createBy":"c47fb9fe3c1a11ea8334fa163e1166bd","changeBy":"c47fb9fe3c1a11ea8334fa163e1166bd","failureCode":"F00007","failureName":"H故障类1","questionCode":"P00009","questionName":"这是个古战","parentCode":"GD20032300001","parentName":"dd","locationCode":"HWTN","locationName":"特耐","assetCode":"02990018","assetName":"坩埚制料生产线","siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":"GD20040300002","createName":"hua","procId":null,"approved":null},{"id":"0001","createDateTime":1571038356000,"updateDateTime":1574746708000,"woCode":"工单001","description":"测试1","locationId":"61c80cd705e511ea8334fa163e1166bd","assetId":"41ea5c72807311ea8334fa163e1166bd","parentId":"","failureCodeId":"7e29f2bb37a911e8b81100163e049447","questionId":"60693011e0d411e98334fa163e1166bd","workType":1,"woType":1,"status":1,"siteId":"076068cfffa211e98334fa163e1166bd","shutDown":false,"shutdownTime":1849581682000,"recoveryTime":1550810662000,"grant":false,"materiel":false,"detailedInformation":"1","schedStart":1533962482000,"schedFinish":1533962482000,"actStart":1533962482000,"actFinish":1533962482000,"pmCode":"1","standardOperation":"1","delete":false,"createBy":"28dbc4dd005711ea8334fa163e1166bd","changeBy":"28dbc4dd005711ea8334fa163e1166bd","failureCode":null,"failureName":null,"questionCode":null,"questionName":null,"parentCode":null,"parentName":null,"locationCode":null,"locationName":null,"assetCode":"0808051001","assetName":"h设备名","siteCode":"ZW","siteName":"正望钢水集团","linkedNumberId":null,"linkedNumber":null,"createName":null,"procId":null,"approved":null}]
* prePage : 0
* nextPage : 0
* isFirstPage : true
* isLastPage : true
* hasPreviousPage : false
* hasNextPage : false
* navigatePages : 8
* navigatepageNums : [1]
* navigateFirstPage : 1
* navigateLastPage : 1
* firstPage : 1
* lastPage : 1
*/
private List<ListBean> list; private List<ListBean> list;
public List<ListBean> getList() { public List<ListBean> getList() {
return list; return list;
} }
...@@ -45,102 +22,73 @@ public class TicketBean extends BaseMesPageBean { ...@@ -45,102 +22,73 @@ public class TicketBean extends BaseMesPageBean {
this.list = list; this.list = list;
} }
public static class ListBean { public static class ListBean {
/** /**
* id : 31a39e1f757811ea8334fa163e1166bd * id : 46
* createDateTime : 1585896967000 * createDateTime : 2020-04-15 16:33:15
* updateDateTime : 1585896967000 * updateDateTime : 2020-04-21 13:23:56
* woCode : GD20040300002 * jobNo : SCTN20041512
* description : 123 * customerUserCode : KN00122
* locationId : 29bda088516711ea8334fa163e1166bd * customerUserName : 山东莱德机械有限公司
* assetId : 9daab57f312d11ea8334fa163e1166bd * salesCompanyCode : GK29
* parentId : f8227db26ce511ea8334fa163e1166bd * salesCompanyName : 销售四公司
* failureCodeId : c6386c6e103011ea8334fa163e1166bd * salesManagerCode : EM1202001
* questionId : 8ba92b1d8a8f41aeb83cd44b23a44bdc * salesManagerName : 史延亮
* workType : 1 * jobTypeId : 03
* woType : 1 * jobTypeName : 质量异议处理
* status : 1 * jobDescription : cs
* siteId : 076068cfffa211e98334fa163e1166bd * jobUserId : 398c852b38e911ea8334fa163e1166bd
* shutDown : true * jobUserName : hello
* shutdownTime : 1585670400000 * peopleCount : null
* recoveryTime : 1585670400000 * planBeginDate : 2020-04-16 00:00:00
* grant : true * planEndDate : 2020-04-23 00:00:00
* materiel : true * createUserId : 398c852b38e911ea8334fa163e1166bd
* detailedInformation : 2 * createUserName : hello
* schedStart : null * updateUserId : 398c852b38e911ea8334fa163e1166bd
* schedFinish : null * updateUserName : null
* actStart : null * approvalUserId : null
* actFinish : null * approvalUserName : null
* pmCode : null * approvalDateTime : null
* standardOperation : null * acceptUserId : 398c852b38e911ea8334fa163e1166bd
* acceptUserName : hello
* acceptDateTime : 2020-04-21 13:23:56
* jobStatus : 2
* remark : null
* delete : false * delete : false
* createBy : 398c852b38e911ea8334fa163e1166bd
* changeBy : null
* failureCode : F00033
* failureName : 第二次测试
* questionCode : P00081
* questionName : 儿子
* parentCode : GD20032300001
* parentName : dd
* locationCode : HWHWHWHWHW
* locationName : null
* assetCode : 02990018
* assetName : 坩埚制料生产线
* siteCode : ZW
* siteName : 正望钢水集团
* linkedNumberId : null
* linkedNumber : GD20032300001
* createName : hello
* procId : null
* approved : null
*/ */
private String id; private String id;
private long createDateTime; private String createDateTime;
private long updateDateTime; private String updateDateTime;
private String woCode; private String jobNo;
private String description; private String customerUserCode;
private String locationId; private String customerUserName;
private String assetId; private String salesCompanyCode;
private String parentId; private String salesCompanyName;
private String failureCodeId; private String salesManagerCode;
private String questionId; private String salesManagerName;
private int workType; private String jobTypeId;
private int woType; private String jobTypeName;
private int status; private String jobDescription;
private String siteId; private String jobUserId;
private boolean shutDown; private String jobUserName;
private long shutdownTime; private String peopleCount;
private long recoveryTime; private String planBeginDate;
private boolean grant; private String planEndDate;
private boolean materiel; private String createUserId;
private String detailedInformation; private String createUserName;
private Object schedStart; private String updateUserId;
private Object schedFinish; private Object updateUserName;
private Object actStart; private Object approvalUserId;
private Object actFinish; private Object approvalUserName;
private Object pmCode; private Object approvalDateTime;
private Object standardOperation; private String acceptUserId;
private String acceptUserName;
private String acceptDateTime;
private int jobStatus;
private Object remark;
private boolean delete; private boolean delete;
private String createBy;
private Object changeBy;
private String failureCode;
private String failureName;
private String questionCode;
private String questionName;
private String parentCode;
private String parentName;
private String locationCode;
private Object locationName;
private String assetCode;
private String assetName;
private String siteCode;
private String siteName;
private Object linkedNumberId;
private String linkedNumber;
private String createName;
private Object procId;
private Object approved;
public String getId() { public String getId() {
return id; return id;
...@@ -150,364 +98,244 @@ public class TicketBean extends BaseMesPageBean { ...@@ -150,364 +98,244 @@ public class TicketBean extends BaseMesPageBean {
this.id = id; this.id = id;
} }
public long getCreateDateTime() { public String getCreateDateTime() {
return createDateTime; return createDateTime;
} }
public void setCreateDateTime(long createDateTime) { public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime; this.createDateTime = createDateTime;
} }
public long getUpdateDateTime() { public String getUpdateDateTime() {
return updateDateTime; return updateDateTime;
} }
public void setUpdateDateTime(long updateDateTime) { public void setUpdateDateTime(String updateDateTime) {
this.updateDateTime = updateDateTime; this.updateDateTime = updateDateTime;
} }
public String getWoCode() { public String getJobNo() {
return woCode; return jobNo;
}
public void setWoCode(String woCode) {
this.woCode = woCode;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getLocationId() {
return locationId;
}
public void setLocationId(String locationId) {
this.locationId = locationId;
}
public String getAssetId() {
return assetId;
}
public void setAssetId(String assetId) {
this.assetId = assetId;
} }
public String getParentId() { public void setJobNo(String jobNo) {
return parentId; this.jobNo = jobNo;
} }
public void setParentId(String parentId) { public String getCustomerUserCode() {
this.parentId = parentId; return customerUserCode;
} }
public String getFailureCodeId() { public void setCustomerUserCode(String customerUserCode) {
return failureCodeId; this.customerUserCode = customerUserCode;
} }
public void setFailureCodeId(String failureCodeId) { public String getCustomerUserName() {
this.failureCodeId = failureCodeId; return customerUserName;
} }
public String getQuestionId() { public void setCustomerUserName(String customerUserName) {
return questionId; this.customerUserName = customerUserName;
} }
public void setQuestionId(String questionId) { public String getSalesCompanyCode() {
this.questionId = questionId; return salesCompanyCode;
} }
public int getWorkType() { public void setSalesCompanyCode(String salesCompanyCode) {
return workType; this.salesCompanyCode = salesCompanyCode;
} }
public void setWorkType(int workType) { public String getSalesCompanyName() {
this.workType = workType; return salesCompanyName;
} }
public int getWoType() { public void setSalesCompanyName(String salesCompanyName) {
return woType; this.salesCompanyName = salesCompanyName;
} }
public void setWoType(int woType) { public String getSalesManagerCode() {
this.woType = woType; return salesManagerCode;
} }
public int getStatus() { public void setSalesManagerCode(String salesManagerCode) {
return status; this.salesManagerCode = salesManagerCode;
} }
public void setStatus(int status) { public String getSalesManagerName() {
this.status = status; return salesManagerName;
} }
public String getSiteId() { public void setSalesManagerName(String salesManagerName) {
return siteId; this.salesManagerName = salesManagerName;
} }
public void setSiteId(String siteId) { public String getJobTypeId() {
this.siteId = siteId; return jobTypeId;
} }
public boolean isShutDown() { public void setJobTypeId(String jobTypeId) {
return shutDown; this.jobTypeId = jobTypeId;
} }
public void setShutDown(boolean shutDown) { public String getJobTypeName() {
this.shutDown = shutDown; return jobTypeName;
} }
public long getShutdownTime() { public void setJobTypeName(String jobTypeName) {
return shutdownTime; this.jobTypeName = jobTypeName;
} }
public void setShutdownTime(long shutdownTime) { public String getJobDescription() {
this.shutdownTime = shutdownTime; return jobDescription;
} }
public long getRecoveryTime() { public void setJobDescription(String jobDescription) {
return recoveryTime; this.jobDescription = jobDescription;
} }
public void setRecoveryTime(long recoveryTime) { public String getJobUserId() {
this.recoveryTime = recoveryTime; return jobUserId;
} }
public boolean isGrant() { public void setJobUserId(String jobUserId) {
return grant; this.jobUserId = jobUserId;
} }
public void setGrant(boolean grant) { public String getJobUserName() {
this.grant = grant; return jobUserName;
} }
public boolean isMateriel() { public void setJobUserName(String jobUserName) {
return materiel; this.jobUserName = jobUserName;
} }
public void setMateriel(boolean materiel) { public String getPeopleCount() {
this.materiel = materiel; return peopleCount;
} }
public String getDetailedInformation() { public void setPeopleCount(String peopleCount) {
return detailedInformation; this.peopleCount = peopleCount;
} }
public void setDetailedInformation(String detailedInformation) { public String getPlanBeginDate() {
this.detailedInformation = detailedInformation; return planBeginDate;
} }
public Object getSchedStart() { public void setPlanBeginDate(String planBeginDate) {
return schedStart; this.planBeginDate = planBeginDate;
} }
public void setSchedStart(Object schedStart) { public String getPlanEndDate() {
this.schedStart = schedStart; return planEndDate;
} }
public Object getSchedFinish() { public void setPlanEndDate(String planEndDate) {
return schedFinish; this.planEndDate = planEndDate;
} }
public void setSchedFinish(Object schedFinish) { public String getCreateUserId() {
this.schedFinish = schedFinish; return createUserId;
} }
public Object getActStart() { public void setCreateUserId(String createUserId) {
return actStart; this.createUserId = createUserId;
} }
public void setActStart(Object actStart) { public String getCreateUserName() {
this.actStart = actStart; return createUserName;
} }
public Object getActFinish() { public void setCreateUserName(String createUserName) {
return actFinish; this.createUserName = createUserName;
}
public void setActFinish(Object actFinish) {
this.actFinish = actFinish;
}
public Object getPmCode() {
return pmCode;
}
public void setPmCode(Object pmCode) {
this.pmCode = pmCode;
}
public Object getStandardOperation() {
return standardOperation;
}
public void setStandardOperation(Object standardOperation) {
this.standardOperation = standardOperation;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
} }
public String getCreateBy() { public String getUpdateUserId() {
return createBy; return updateUserId;
} }
public void setCreateBy(String createBy) { public void setUpdateUserId(String updateUserId) {
this.createBy = createBy; this.updateUserId = updateUserId;
} }
public Object getChangeBy() { public Object getUpdateUserName() {
return changeBy; return updateUserName;
} }
public void setChangeBy(Object changeBy) { public void setUpdateUserName(Object updateUserName) {
this.changeBy = changeBy; this.updateUserName = updateUserName;
} }
public String getFailureCode() { public Object getApprovalUserId() {
return failureCode; return approvalUserId;
} }
public void setFailureCode(String failureCode) { public void setApprovalUserId(Object approvalUserId) {
this.failureCode = failureCode; this.approvalUserId = approvalUserId;
} }
public String getFailureName() { public Object getApprovalUserName() {
return failureName; return approvalUserName;
} }
public void setFailureName(String failureName) { public void setApprovalUserName(Object approvalUserName) {
this.failureName = failureName; this.approvalUserName = approvalUserName;
} }
public String getQuestionCode() { public Object getApprovalDateTime() {
return questionCode; return approvalDateTime;
} }
public void setQuestionCode(String questionCode) { public void setApprovalDateTime(Object approvalDateTime) {
this.questionCode = questionCode; this.approvalDateTime = approvalDateTime;
} }
public String getQuestionName() { public String getAcceptUserId() {
return questionName; return acceptUserId;
} }
public void setQuestionName(String questionName) { public void setAcceptUserId(String acceptUserId) {
this.questionName = questionName; this.acceptUserId = acceptUserId;
} }
public String getParentCode() { public String getAcceptUserName() {
return parentCode; return acceptUserName;
} }
public void setParentCode(String parentCode) { public void setAcceptUserName(String acceptUserName) {
this.parentCode = parentCode; this.acceptUserName = acceptUserName;
} }
public String getParentName() { public String getAcceptDateTime() {
return parentName; return acceptDateTime;
} }
public void setParentName(String parentName) { public void setAcceptDateTime(String acceptDateTime) {
this.parentName = parentName; this.acceptDateTime = acceptDateTime;
} }
public String getLocationCode() { public int getJobStatus() {
return locationCode; return jobStatus;
} }
public void setLocationCode(String locationCode) { public void setJobStatus(int jobStatus) {
this.locationCode = locationCode; this.jobStatus = jobStatus;
} }
public Object getLocationName() { public Object getRemark() {
return locationName; return remark;
} }
public void setLocationName(Object locationName) { public void setRemark(Object remark) {
this.locationName = locationName; this.remark = remark;
} }
public String getAssetCode() { public boolean isDelete() {
return assetCode; return delete;
}
public void setAssetCode(String assetCode) {
this.assetCode = assetCode;
}
public String getAssetName() {
return assetName;
}
public void setAssetName(String assetName) {
this.assetName = assetName;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public Object getLinkedNumberId() {
return linkedNumberId;
}
public void setLinkedNumberId(Object linkedNumberId) {
this.linkedNumberId = linkedNumberId;
}
public String getLinkedNumber() {
return linkedNumber;
}
public void setLinkedNumber(String linkedNumber) {
this.linkedNumber = linkedNumber;
}
public String getCreateName() {
return createName;
}
public void setCreateName(String createName) {
this.createName = createName;
}
public Object getProcId() {
return procId;
}
public void setProcId(Object procId) {
this.procId = procId;
}
public Object getApproved() {
return approved;
} }
public void setApproved(Object approved) { public void setDelete(boolean delete) {
this.approved = approved; this.delete = delete;
} }
} }
} }
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ d7c8b8d5
...@@ -9,6 +9,7 @@ import io.reactivex.Observable; ...@@ -9,6 +9,7 @@ import io.reactivex.Observable;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.POST; import retrofit2.http.POST;
import retrofit2.http.Query;
/** /**
* author : flexible * author : flexible
...@@ -26,8 +27,21 @@ public interface MesApiService { ...@@ -26,8 +27,21 @@ public interface MesApiService {
* *
* @return * @return
*/ */
@POST("/himes/api/workOrder/show/pageWorkOrder.json") @POST("/himes/api/msWorkOrder/show/page.json")
Observable<BaseMesBean> ticketList(@Body RequestBody requestBody); Observable<BaseMesBean> ticketList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 新增
*
* @return
*/
@POST("/himes/api/msWorkOrder/save.json")
Observable<BaseMesBean> tickeAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 功能
*
* @return
*/
@POST("/himes/api/msJobTypeInfo/show/list.json")
Observable<BaseMesBean> jobType(@Query("functionId") String functionId, @Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ d7c8b8d5
...@@ -11,11 +11,21 @@ import android.widget.TextView; ...@@ -11,11 +11,21 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.mesBean.JobTypeBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.JobTypeAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -49,6 +59,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -49,6 +59,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
TextView tvManager; TextView tvManager;
@BindView(R.id.rl_manager) @BindView(R.id.rl_manager)
RelativeLayout rlManager; RelativeLayout rlManager;
@BindView(R.id.tv_clazz)
TextView tvClazz;
@BindView(R.id.rv_clazz)
RecyclerView rvClazz;
@BindView(R.id.tv_desc) @BindView(R.id.tv_desc)
TextView tvDesc; TextView tvDesc;
@BindView(R.id.tv_person) @BindView(R.id.tv_person)
...@@ -57,10 +71,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -57,10 +71,10 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
TextView tvStartTime; TextView tvStartTime;
@BindView(R.id.tv_end_time) @BindView(R.id.tv_end_time)
TextView tvEndTime; TextView tvEndTime;
@BindView(R.id.tv_create_person)
TextView tvCreatePerson;
@BindView(R.id.tv_time) @BindView(R.id.tv_time)
TextView tvTime; TextView tvTime;
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.tv_take_on) @BindView(R.id.tv_take_on)
TextView tvTakeOn; TextView tvTakeOn;
@BindView(R.id.rl_log) @BindView(R.id.rl_log)
...@@ -68,6 +82,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -68,6 +82,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
@BindView(R.id.rl_add_log) @BindView(R.id.rl_add_log)
RelativeLayout rlAddLog; RelativeLayout rlAddLog;
private AccountBean dataBean; private AccountBean dataBean;
private TicketBean.ListBean data;
@Override @Override
protected void initView() { protected void initView() {
...@@ -76,10 +91,56 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -76,10 +91,56 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
if (TextUtils.equals(from, "1")) { if (TextUtils.equals(from, "1")) {
llBottom.setVisibility(View.VISIBLE); llBottom.setVisibility(View.VISIBLE);
} }
rvClazz.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
tvCode.setText(data.getJobNo());
tvClient.setText(data.getCustomerUserName());
tvCompany.setText(data.getSalesCompanyName());
tvManager.setText(data.getSalesManagerName());
tvClazz.setText(data.getJobTypeName());
tvDesc.setText(data.getJobDescription());
if (!TextUtils.isEmpty(data.getPeopleCount()))
tvPerson.setText(data.getPeopleCount());
tvStartTime.setText(data.getPlanBeginDate());
tvEndTime.setText(data.getPlanEndDate());
tvCreatePerson.setText(data.getCreateUserName());
tvTime.setText(data.getCreateDateTime());
tvTime.setText(data.getCreateDateTime());
tvTakeOn.setText(data.getJobUserName());
}
private void getType(String id) {
Map<String, Object> param = WorkUtils.simpleParam();
param.put("jobTypeCode", id);
RtfUtils.getMesRtf().jobType("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<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
JobTypeAdapter jobTypeAdapter = new JobTypeAdapter(R.layout.item_job_type, jobTypeList);
jobTypeAdapter.bindToRecyclerView(rvClazz);
}
});
} }
@Override @Override
protected void initData() { protected void initData() {
getType(data.getJobTypeId());
getData(); getData();
} }
...@@ -139,5 +200,4 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -139,5 +200,4 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
break; break;
} }
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java
浏览文件 @ d7c8b8d5
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -16,11 +13,11 @@ import com.wd.workoffice.R; ...@@ -16,11 +13,11 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ImgAdapter; import com.wd.workoffice.ui.adapter.ImgAdapter;
import com.wd.workoffice.ui.adapter.StarAdapter; import com.wd.workoffice.ui.adapter.StarAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -57,6 +54,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -57,6 +54,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
private AccountBean dataBean; private AccountBean dataBean;
private List<Object> imgList; private List<Object> imgList;
private ImgAdapter imgAdapter; private ImgAdapter imgAdapter;
private TicketBean.ListBean data;
@Override @Override
protected void initView() { protected void initView() {
...@@ -66,6 +64,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -66,6 +64,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
imgList = new ArrayList<>(); imgList = new ArrayList<>();
imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList); imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg); imgAdapter.bindToRecyclerView(rvImg);
...@@ -103,7 +102,6 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity { ...@@ -103,7 +102,6 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
private void getData() { private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ d7c8b8d5
...@@ -120,7 +120,7 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -120,7 +120,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().ticketList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -173,7 +173,14 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -173,7 +173,14 @@ public class MesTicketListActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesTicketDetailFinishActivity.class); switch (dataList.get(position).getJobStatus()) {
case 1:
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break;
case 2:
startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
break;
}
} }
}); });
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @ d7c8b8d5
...@@ -117,7 +117,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity { ...@@ -117,7 +117,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().ticketList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java
浏览文件 @ d7c8b8d5
...@@ -133,7 +133,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity { ...@@ -133,7 +133,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() { RtfUtils.getMesRtf().ticketList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/JobTypeAdapter.java 0 → 100644
浏览文件 @ d7c8b8d5
package com.wd.workoffice.ui.adapter;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.bean.mesBean.JobTypeBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.widget.AddAndReduceDoubleView;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
import flexible.xd.android_base.utils.ToastUtil;
/**
* Created by flexible on 2018/8/13.
*/
public class JobTypeAdapter extends BaseQuickAdapter<JobTypeBean, BaseViewHolder> {
public JobTypeAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, JobTypeBean item) {
helper.setText(R.id.tv_name, item.getJobTypeContentName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesTicketAdapter.java
浏览文件 @ d7c8b8d5
...@@ -24,10 +24,10 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base ...@@ -24,10 +24,10 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base
@Override @Override
protected void convert(BaseViewHolder helper, TicketBean.ListBean item) { protected void convert(BaseViewHolder helper, TicketBean.ListBean item) {
helper.setText(R.id.tv_name, item.getAssetName()); helper.setText(R.id.tv_name, item.getCustomerUserName());
helper.setText(R.id.tv_pro_name, item.getFailureName()); helper.setText(R.id.tv_pro_name, item.getJobTypeName());
helper.setText(R.id.tv_status, item.getStatus() + ""); helper.setText(R.id.tv_status, item.getJobStatus() + "");
helper.setText(R.id.tv_time, TimeUtils.millis2String(item.getCreateDateTime())); helper.setText(R.id.tv_time, item.getCreateDateTime());
} }
} }
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ d7c8b8d5
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"> android:background="@color/white">
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="任务单号:" android:text="任务单号"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
...@@ -87,7 +88,6 @@ ...@@ -87,7 +88,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout> </RelativeLayout>
...@@ -145,7 +144,6 @@ ...@@ -145,7 +144,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -173,6 +171,7 @@ ...@@ -173,6 +171,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_clazz"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
...@@ -180,6 +179,7 @@ ...@@ -180,6 +179,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clazz"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3mm" android:layout_marginTop="3mm"
...@@ -236,7 +236,6 @@ ...@@ -236,7 +236,6 @@
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:gravity="right" android:gravity="right"
android:hint="请输入"
android:padding="3mm" android:padding="3mm"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -254,7 +253,7 @@ ...@@ -254,7 +253,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="计划开始时间" android:text="计划时间"
android:textSize="14sp" /> android:textSize="14sp" />
<LinearLayout <LinearLayout
...@@ -307,12 +306,12 @@ ...@@ -307,12 +306,12 @@
<TextView <TextView
android:id="@+id/tv_create_person"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="20mm" android:layout_marginRight="3mm"
android:gravity="center" android:gravity="center"
android:padding="3mm"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -321,7 +320,6 @@ ...@@ -321,7 +320,6 @@
<View style="@style/dividerX" /> <View style="@style/dividerX" />
<RelativeLayout <RelativeLayout
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"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
...@@ -341,7 +339,6 @@ ...@@ -341,7 +339,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -369,7 +366,6 @@ ...@@ -369,7 +366,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="3mm" android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
......
app/src/main/res/layout/item_job_type.xml 0 → 100644
浏览文件 @ d7c8b8d5
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论