Skip to content

D
DutyManager
Commit 349c6026 authored by Xinghaoxiang's avatar Xinghaoxiang
Browse files
Options

coding

parent d4501847
Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 261 deletions
.idea/misc.xml
View file @ 349c6026
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/modules.xml
View file @ 349c6026
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/DutyManager.iml" filepath="$PROJECT_DIR$/DutyManager.iml" /> <module fileurl="file://$PROJECT_DIR$/DutyManager.iml" filepath="$PROJECT_DIR$/DutyManager.iml" />
<module fileurl="file://$PROJECT_DIR$/Zhiban.iml" filepath="$PROJECT_DIR$/Zhiban.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules> </modules>
</component> </component>
......
app/src/main/java/cn/bsl/bxbg/zhiban/net/api/DutyAPI.java
View file @ 349c6026
...@@ -79,11 +79,11 @@ public interface DutyAPI { ...@@ -79,11 +79,11 @@ public interface DutyAPI {
@Query("pageSize") String pageSize, @Query("pageSize") String pageSize,
@Query("refers") String refers); @Query("refers") String refers);
@GET("cc_duties") @GET("cc_shifts")
Observable<List<DutiesTbResponse>> dutiesTbDetails(@Query("pageNo") String pageNo, Observable<List<DutiesTbResponse>> dutiesTbDetails(@Query("pageNo") String pageNo,
@Query("pageSize") String pageSize, @Query("pageSize") String pageSize,
@Query("filters") String filters, @Query("filters") String filters,
@Query("refers") String refers); @Query("includes") String refers);
@GET("cc_shifts") @GET("cc_shifts")
Call<List<CCShifts>> ccShifts(@Query("pageNo") String pageNo, Call<List<CCShifts>> ccShifts(@Query("pageNo") String pageNo,
......
app/src/main/java/cn/bsl/bxbg/zhiban/net/client/DutyPlanClient.java
View file @ 349c6026
...@@ -12,8 +12,6 @@ import cn.bsl.bxbg.zhiban.net.response.DutyPlanResponse; ...@@ -12,8 +12,6 @@ import cn.bsl.bxbg.zhiban.net.response.DutyPlanResponse;
import cn.bsl.bxbg.zhiban.net.response.TiaobanBean; import cn.bsl.bxbg.zhiban.net.response.TiaobanBean;
import cn.bsl.bxbg.zhiban.utils.Constant; import cn.bsl.bxbg.zhiban.utils.Constant;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import io.reactivex.functions.Function;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
...@@ -68,7 +66,7 @@ public class DutyPlanClient extends BaseClient { ...@@ -68,7 +66,7 @@ public class DutyPlanClient extends BaseClient {
} }
public Observable<List<DutiesTbResponse>> dutiesTbDetails(String id) { public Observable<List<DutiesTbResponse>> dutiesTbDetails(String id) {
return dutyAPI.dutiesTbDetails("1", "1000","{'cc_duty':{'id':{'like':'"+id+"'}}}","{'cc_shift':{'includes':['applicant_duty_id']}}"); return dutyAPI.dutiesTbDetails("1", "1000","{'cc_shift':{'id':{'equalTo':'"+id+"'}}}","{'cc_duty':{'includes':['applicant_duty_id']}}");
} }
public Call<List<CCShifts>> shiftsRecord() { public Call<List<CCShifts>> shiftsRecord() {
...@@ -77,7 +75,7 @@ public class DutyPlanClient extends BaseClient { ...@@ -77,7 +75,7 @@ public class DutyPlanClient extends BaseClient {
} }
public Observable<List<CCShiftsUni>> ccshiftUni(String id) { public Observable<List<CCShiftsUni>> ccshiftUni(String id) {
return dutyAPI.ccShiftsUnique("1", "1000", "{'cc_shift':{'applicant_duty_id':{'equalTo':'" + id + "'}}}", return dutyAPI.ccShiftsUnique("1", "1000", "{'cc_shift':{'id':{'equalTo':'" + id + "'}}}",
"{'cc_duty':{'includes':['applicant_duty_id']}}"); "{'cc_duty':{'includes':['applicant_duty_id']}}");
} }
......
app/src/main/java/cn/bsl/bxbg/zhiban/net/response/DutiesTbResponse.java
View file @ 349c6026
package cn.bsl.bxbg.zhiban.net.response; package cn.bsl.bxbg.zhiban.net.response;
import java.util.List;
/** /**
* Created by Xinghx on 2018/3/20 0020. * Created by Xinghx on 2018/3/20 0020.
*/ */
...@@ -9,9 +7,9 @@ import java.util.List; ...@@ -9,9 +7,9 @@ import java.util.List;
public class DutiesTbResponse { public class DutiesTbResponse {
/** /**
* superior : {"id":"4393fd967ef84e938271846882895dd1","classLeadersId":"12","classLeaders":"部门负责人","department":"App技术支持","postLeaders":"部门负责人","morning":"李亮,测试0","noon":"董春梅,李亮","evening":"李亮,董春梅","watchPeople":null,"type":null,"dutyDate":"2018-03-01","endTime":null,"startTime":null,"createTime":"2018-03-18 16:12:01","lastUpdateTime":"2018-03-20 15:20:53","onDutyPlanId":"3a157900491f41d6b1bab142e46038e1","dutyStage":null,"postDuty":null,"remark":null,"numberDays":null,"holiday":null,"holidayName":null} * superior : {"id":"22887cf509bc4fa4a93af1f665a40495","applicantId":"11","applicant":"测试0","transferredName":"测试0","transferredClass":"测试3号","shiftTime":"2018-03-22","applicantDutyId":"df852a8e8d0a4159ab4c573dc89dd8d8","transferredClassTime":"0","transferredClassDutyId":null,"status":"1","reason":"啊啊啊啊","applicationTime":null,"createTime":"2018-04-11 09:52:05","lastUpdateTime":"2018-04-11 09:57:27","leaderId":null,"applicantPosition":null,"approvalResult":null}
* includes : {} * includes : {"cc_duty":{"id":"df852a8e8d0a4159ab4c573dc89dd8d8","classLeadersId":"12","classLeaders":"部门负责人","department":"App技术支持","postLeaders":null,"morning":"测试3号","noon":"测试0","evening":"测试0","watchPeople":null,"type":null,"dutyDate":"2018-03-22","endTime":null,"startTime":null,"createTime":"2018-04-11 09:49:15","lastUpdateTime":"2018-04-11 09:57:28","onDutyPlanId":"3a157900491f41d6b1bab142e46038e1","dutyStage":null,"postDuty":null,"remark":null,"numberDays":null,"holiday":null,"holidayName":null}}
* refers : {"cc_shift":[{"id":"6d151791912c44b78a317972c3073479","applicantId":"11","applicant":"科员","transferredName":"测试0","transferredClass":null,"shiftTime":null,"applicantDutyId":"4393fd967ef84e938271846882895dd1","transferredClassTime":null,"transferredClassDutyId":null,"status":null,"reason":"测试","applicationTime":null,"createTime":"2018-03-20 15:20:53","lastUpdateTime":"2018-03-20 15:20:53","leaderId":null,"applicantPosition":null}]} * refers : {}
* relates : {} * relates : {}
*/ */
...@@ -54,52 +52,42 @@ public class DutiesTbResponse { ...@@ -54,52 +52,42 @@ public class DutiesTbResponse {
public static class SuperiorBean { public static class SuperiorBean {
/** /**
* id : 4393fd967ef84e938271846882895dd1 * id : 22887cf509bc4fa4a93af1f665a40495
* classLeadersId : 12 * applicantId : 11
* classLeaders : 部门负责人 * applicant : 测试0
* department : App技术支持 * transferredName : 测试0
* postLeaders : 部门负责人 * transferredClass : 测试3号
* morning : 李亮,测试0 * shiftTime : 2018-03-22
* noon : 董春梅,李亮 * applicantDutyId : df852a8e8d0a4159ab4c573dc89dd8d8
* evening : 李亮,董春梅 * transferredClassTime : 0
* watchPeople : null * transferredClassDutyId : null
* type : null * status : 1
* dutyDate : 2018-03-01 * reason : 啊啊啊啊
* endTime : null * applicationTime : null
* startTime : null * createTime : 2018-04-11 09:52:05
* createTime : 2018-03-18 16:12:01 * lastUpdateTime : 2018-04-11 09:57:27
* lastUpdateTime : 2018-03-20 15:20:53 * leaderId : null
* onDutyPlanId : 3a157900491f41d6b1bab142e46038e1 * applicantPosition : null
* dutyStage : null * approvalResult : null
* postDuty : null
* remark : null
* numberDays : null
* holiday : null
* holidayName : null
*/ */
private String id; private String id;
private String classLeadersId; private String applicantId;
private String classLeaders; private String applicant;
private String department; private String transferredName;
private String postLeaders; private String transferredClass;
private String morning; private String shiftTime;
private String noon; private String applicantDutyId;
private String evening; private String transferredClassTime;
private Object watchPeople; private Object transferredClassDutyId;
private Object type; private String status;
private String dutyDate; private String reason;
private Object endTime; private Object applicationTime;
private Object startTime;
private String createTime; private String createTime;
private String lastUpdateTime; private String lastUpdateTime;
private String onDutyPlanId; private Object leaderId;
private Object dutyStage; private Object applicantPosition;
private Object postDuty; private Object approvalResult;
private Object remark;
private Object numberDays;
private Object holiday;
private Object holidayName;
public String getId() { public String getId() {
return id; return id;
...@@ -109,100 +97,92 @@ public class DutiesTbResponse { ...@@ -109,100 +97,92 @@ public class DutiesTbResponse {
this.id = id; this.id = id;
} }
public String getClassLeadersId() { public String getApplicantId() {
return classLeadersId; return applicantId;
}
public void setClassLeadersId(String classLeadersId) {
this.classLeadersId = classLeadersId;
} }
public String getClassLeaders() { public void setApplicantId(String applicantId) {
return classLeaders; this.applicantId = applicantId;
} }
public void setClassLeaders(String classLeaders) { public String getApplicant() {
this.classLeaders = classLeaders; return applicant;
} }
public String getDepartment() { public void setApplicant(String applicant) {
return department; this.applicant = applicant;
} }
public void setDepartment(String department) { public String getTransferredName() {
this.department = department; return transferredName;
} }
public String getPostLeaders() { public void setTransferredName(String transferredName) {
return postLeaders; this.transferredName = transferredName;
} }
public void setPostLeaders(String postLeaders) { public String getTransferredClass() {
this.postLeaders = postLeaders; return transferredClass;
} }
public String getMorning() { public void setTransferredClass(String transferredClass) {
return morning; this.transferredClass = transferredClass;
} }
public void setMorning(String morning) { public String getShiftTime() {
this.morning = morning; return shiftTime;
} }
public String getNoon() { public void setShiftTime(String shiftTime) {
return noon; this.shiftTime = shiftTime;
} }
public void setNoon(String noon) { public String getApplicantDutyId() {
this.noon = noon; return applicantDutyId;
} }
public String getEvening() { public void setApplicantDutyId(String applicantDutyId) {
return evening; this.applicantDutyId = applicantDutyId;
} }
public void setEvening(String evening) { public String getTransferredClassTime() {
this.evening = evening; return transferredClassTime;
} }
public Object getWatchPeople() { public void setTransferredClassTime(String transferredClassTime) {
return watchPeople; this.transferredClassTime = transferredClassTime;
} }
public void setWatchPeople(Object watchPeople) { public Object getTransferredClassDutyId() {
this.watchPeople = watchPeople; return transferredClassDutyId;
} }
public Object getType() { public void setTransferredClassDutyId(Object transferredClassDutyId) {
return type; this.transferredClassDutyId = transferredClassDutyId;
} }
public void setType(Object type) { public String getStatus() {
this.type = type; return status;
} }
public String getDutyDate() { public void setStatus(String status) {
return dutyDate; this.status = status;
} }
public void setDutyDate(String dutyDate) { public String getReason() {
this.dutyDate = dutyDate; return reason;
} }
public Object getEndTime() { public void setReason(String reason) {
return endTime; this.reason = reason;
} }
public void setEndTime(Object endTime) { public Object getApplicationTime() {
this.endTime = endTime; return applicationTime;
} }
public Object getStartTime() { public void setApplicationTime(Object applicationTime) {
return startTime; this.applicationTime = applicationTime;
}
public void setStartTime(Object startTime) {
this.startTime = startTime;
} }
public String getCreateTime() { public String getCreateTime() {
...@@ -221,113 +201,94 @@ public class DutiesTbResponse { ...@@ -221,113 +201,94 @@ public class DutiesTbResponse {
this.lastUpdateTime = lastUpdateTime; this.lastUpdateTime = lastUpdateTime;
} }
public String getOnDutyPlanId() { public Object getLeaderId() {
return onDutyPlanId; return leaderId;
}
public void setOnDutyPlanId(String onDutyPlanId) {
this.onDutyPlanId = onDutyPlanId;
}
public Object getDutyStage() {
return dutyStage;
}
public void setDutyStage(Object dutyStage) {
this.dutyStage = dutyStage;
}
public Object getPostDuty() {
return postDuty;
} }
public void setPostDuty(Object postDuty) { public void setLeaderId(Object leaderId) {
this.postDuty = postDuty; this.leaderId = leaderId;
} }
public Object getRemark() { public Object getApplicantPosition() {
return remark; return applicantPosition;
} }
public void setRemark(Object remark) { public void setApplicantPosition(Object applicantPosition) {
this.remark = remark; this.applicantPosition = applicantPosition;
} }
public Object getNumberDays() { public Object getApprovalResult() {
return numberDays; return approvalResult;
} }
public void setNumberDays(Object numberDays) { public void setApprovalResult(Object approvalResult) {
this.numberDays = numberDays; this.approvalResult = approvalResult;
}
public Object getHoliday() {
return holiday;
}
public void setHoliday(Object holiday) {
this.holiday = holiday;
}
public Object getHolidayName() {
return holidayName;
}
public void setHolidayName(Object holidayName) {
this.holidayName = holidayName;
} }
} }
public static class IncludesBean { public static class IncludesBean {
} /**
* cc_duty : {"id":"df852a8e8d0a4159ab4c573dc89dd8d8","classLeadersId":"12","classLeaders":"部门负责人","department":"App技术支持","postLeaders":null,"morning":"测试3号","noon":"测试0","evening":"测试0","watchPeople":null,"type":null,"dutyDate":"2018-03-22","endTime":null,"startTime":null,"createTime":"2018-04-11 09:49:15","lastUpdateTime":"2018-04-11 09:57:28","onDutyPlanId":"3a157900491f41d6b1bab142e46038e1","dutyStage":null,"postDuty":null,"remark":null,"numberDays":null,"holiday":null,"holidayName":null}
*/
public static class RefersBean { private CcDutyBean cc_duty;
private List<CcShiftBean> cc_shift;
public List<CcShiftBean> getCc_shift() { public CcDutyBean getCc_duty() {
return cc_shift; return cc_duty;
} }
public void setCc_shift(List<CcShiftBean> cc_shift) { public void setCc_duty(CcDutyBean cc_duty) {
this.cc_shift = cc_shift; this.cc_duty = cc_duty;
} }
public static class CcShiftBean { public static class CcDutyBean {
/** /**
* id : 6d151791912c44b78a317972c3073479 * id : df852a8e8d0a4159ab4c573dc89dd8d8
* applicantId : 11 * classLeadersId : 12
* applicant : 科员 * classLeaders : 部门负责人
* transferredName : 测试0 * department : App技术支持
* transferredClass : null * postLeaders : null
* shiftTime : null * morning : 测试3号
* applicantDutyId : 4393fd967ef84e938271846882895dd1 * noon : 测试0
* transferredClassTime : null * evening : 测试0
* transferredClassDutyId : null * watchPeople : null
* status : null * type : null
* reason : 测试 * dutyDate : 2018-03-22
* applicationTime : null * endTime : null
* createTime : 2018-03-20 15:20:53 * startTime : null
* lastUpdateTime : 2018-03-20 15:20:53 * createTime : 2018-04-11 09:49:15
* leaderId : null * lastUpdateTime : 2018-04-11 09:57:28
* applicantPosition : null * onDutyPlanId : 3a157900491f41d6b1bab142e46038e1
* dutyStage : null
* postDuty : null
* remark : null
* numberDays : null
* holiday : null
* holidayName : null
*/ */
private String id; private String id;
private String applicantId; private String classLeadersId;
private String applicant; private String classLeaders;
private String transferredName; private String department;
private String transferredClass; private Object postLeaders;
private Object shiftTime; private String morning;
private String applicantDutyId; private String noon;
private Object transferredClassTime; private String evening;
private Object transferredClassDutyId; private Object watchPeople;
private String status; private Object type;
private String reason; private String dutyDate;
private Object applicationTime; private Object endTime;
private Object startTime;
private String createTime; private String createTime;
private String lastUpdateTime; private String lastUpdateTime;
private Object leaderId; private String onDutyPlanId;
private Object applicantPosition; private Object dutyStage;
private Object postDuty;
private Object remark;
private Object numberDays;
private Object holiday;
private Object holidayName;
public String getId() { public String getId() {
return id; return id;
...@@ -337,92 +298,100 @@ public class DutiesTbResponse { ...@@ -337,92 +298,100 @@ public class DutiesTbResponse {
this.id = id; this.id = id;
} }
public String getApplicantId() { public String getClassLeadersId() {
return applicantId; return classLeadersId;
}
public void setClassLeadersId(String classLeadersId) {
this.classLeadersId = classLeadersId;
}
public String getClassLeaders() {
return classLeaders;
} }
public void setApplicantId(String applicantId) { public void setClassLeaders(String classLeaders) {
this.applicantId = applicantId; this.classLeaders = classLeaders;
} }
public String getApplicant() { public String getDepartment() {
return applicant; return department;
} }
public void setApplicant(String applicant) { public void setDepartment(String department) {
this.applicant = applicant; this.department = department;
} }
public String getTransferredName() { public Object getPostLeaders() {
return transferredName; return postLeaders;
} }
public void setTransferredName(String transferredName) { public void setPostLeaders(Object postLeaders) {
this.transferredName = transferredName; this.postLeaders = postLeaders;
} }
public String getTransferredClass() { public String getMorning() {
return transferredClass; return morning;
} }
public void setTransferredClass(String transferredClass) { public void setMorning(String morning) {
this.transferredClass = transferredClass; this.morning = morning;
} }
public Object getShiftTime() { public String getNoon() {
return shiftTime; return noon;
} }
public void setShiftTime(Object shiftTime) { public void setNoon(String noon) {
this.shiftTime = shiftTime; this.noon = noon;
} }
public String getApplicantDutyId() { public String getEvening() {
return applicantDutyId; return evening;
} }
public void setApplicantDutyId(String applicantDutyId) { public void setEvening(String evening) {
this.applicantDutyId = applicantDutyId; this.evening = evening;
} }
public Object getTransferredClassTime() { public Object getWatchPeople() {
return transferredClassTime; return watchPeople;
} }
public void setTransferredClassTime(Object transferredClassTime) { public void setWatchPeople(Object watchPeople) {
this.transferredClassTime = transferredClassTime; this.watchPeople = watchPeople;
} }
public Object getTransferredClassDutyId() { public Object getType() {
return transferredClassDutyId; return type;
} }
public void setTransferredClassDutyId(Object transferredClassDutyId) { public void setType(Object type) {
this.transferredClassDutyId = transferredClassDutyId; this.type = type;
} }
public String getStatus() { public String getDutyDate() {
return status; return dutyDate;
} }
public void setStatus(String status) { public void setDutyDate(String dutyDate) {
this.status = status; this.dutyDate = dutyDate;
} }
public String getReason() { public Object getEndTime() {
return reason; return endTime;
} }
public void setReason(String reason) { public void setEndTime(Object endTime) {
this.reason = reason; this.endTime = endTime;
} }
public Object getApplicationTime() { public Object getStartTime() {
return applicationTime; return startTime;
} }
public void setApplicationTime(Object applicationTime) { public void setStartTime(Object startTime) {
this.applicationTime = applicationTime; this.startTime = startTime;
} }
public String getCreateTime() { public String getCreateTime() {
...@@ -441,24 +410,67 @@ public class DutiesTbResponse { ...@@ -441,24 +410,67 @@ public class DutiesTbResponse {
this.lastUpdateTime = lastUpdateTime; this.lastUpdateTime = lastUpdateTime;
} }
public Object getLeaderId() { public String getOnDutyPlanId() {
return leaderId; return onDutyPlanId;
}
public void setOnDutyPlanId(String onDutyPlanId) {
this.onDutyPlanId = onDutyPlanId;
}
public Object getDutyStage() {
return dutyStage;
}
public void setDutyStage(Object dutyStage) {
this.dutyStage = dutyStage;
}
public Object getPostDuty() {
return postDuty;
}
public void setPostDuty(Object postDuty) {
this.postDuty = postDuty;
} }
public void setLeaderId(Object leaderId) { public Object getRemark() {
this.leaderId = leaderId; return remark;
} }
public Object getApplicantPosition() { public void setRemark(Object remark) {
return applicantPosition; this.remark = remark;
} }
public void setApplicantPosition(Object applicantPosition) { public Object getNumberDays() {
this.applicantPosition = applicantPosition; return numberDays;
}
public void setNumberDays(Object numberDays) {
this.numberDays = numberDays;
}
public Object getHoliday() {
return holiday;
}
public void setHoliday(Object holiday) {
this.holiday = holiday;
}
public Object getHolidayName() {
return holidayName;
}
public void setHolidayName(Object holidayName) {
this.holidayName = holidayName;
} }
} }
} }
public static class RefersBean {
}
public static class RelatesBean { public static class RelatesBean {
} }
} }
app/src/main/java/cn/bsl/bxbg/zhiban/utils/Constant.java
View file @ 349c6026
...@@ -7,7 +7,7 @@ package cn.bsl.bxbg.zhiban.utils; ...@@ -7,7 +7,7 @@ package cn.bsl.bxbg.zhiban.utils;
public interface Constant { public interface Constant {
String HOST = "http://zjk.haomo-studio.com/zhangjiakouOA/"; String HOST = "http://zjk.haomo-studio.com/zhangjiakouOA/";
String USER_ID = "11"; String USER_ID = "11";
String USER_NAME = "测试1号"; String USER_NAME = "科员";
String BASE_URL="http://haomo-tech.com:8077/hbOA/"; String BASE_URL="http://haomo-tech.com:8077/hbOA/";
// 获取全部人员 // 获取全部人员
String URL_GET_ALL_PEOPLE1 = BASE_URL + "roleManagerController.do?method=searchDeptTree"; String URL_GET_ALL_PEOPLE1 = BASE_URL + "roleManagerController.do?method=searchDeptTree";
......
app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaobanDetailsActivity.java
View file @ 349c6026
...@@ -53,7 +53,7 @@ public class TiaobanDetailsActivity extends BaseActivity { ...@@ -53,7 +53,7 @@ public class TiaobanDetailsActivity extends BaseActivity {
private String id; private String id;
DutyPlanClient dutyPlanClient = new DutyPlanClient(); DutyPlanClient dutyPlanClient = new DutyPlanClient();
String status = "1"; String status = "1";
private String ccShift_id; private String cc_duty_id;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -72,49 +72,49 @@ public class TiaobanDetailsActivity extends BaseActivity { ...@@ -72,49 +72,49 @@ public class TiaobanDetailsActivity extends BaseActivity {
.subscribe(new Consumer<List<DutiesTbResponse>>() { .subscribe(new Consumer<List<DutiesTbResponse>>() {
@Override @Override
public void accept(List<DutiesTbResponse> dutiesTbResponses) throws Exception { public void accept(List<DutiesTbResponse> dutiesTbResponses) throws Exception {
ccShift_id = dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getId(); cc_duty_id = dutiesTbResponses.get(0).getIncludes().getCc_duty().getId();
String createTime = dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getCreateTime(); String createTime = dutiesTbResponses.get(0).getSuperior().getCreateTime();
String dutyDate = dutiesTbResponses.get(0).getSuperior().getDutyDate(); String dutyDate = dutiesTbResponses.get(0).getIncludes().getCc_duty().getDutyDate();
String people = " 早：" + dutiesTbResponses.get(0).getSuperior().getMorning() + "\n 中:" + dutiesTbResponses.get(0).getSuperior().getNoon() + "\n 晚:" + dutiesTbResponses.get(0).getSuperior().getEvening(); String people = " 早：" + dutiesTbResponses.get(0).getIncludes().getCc_duty().getMorning() + "\n 中:" + dutiesTbResponses.get(0).getIncludes().getCc_duty().getNoon() + "\n 晚:" + dutiesTbResponses.get(0).getIncludes().getCc_duty().getEvening();
String change = dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getTransferredName() + " 变更为 " + dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getTransferredClass(); String change = dutiesTbResponses.get(0).getSuperior().getTransferredName() + " 变更为 " + dutiesTbResponses.get(0).getSuperior().getTransferredClass();
dutyTimes.setText(dutyDate); dutyTimes.setText(dutyDate);
person.setText(people); person.setText(people);
changePerson.setText(change); changePerson.setText(change);
// simple if 换班人是我判断id 如果被换班是我 直接修改 // simple if 换班人是我判断id 如果被换班是我 直接修改
if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getTransferredName().equals(Constant.USER_NAME)) { if (dutiesTbResponses.get(0).getSuperior().getTransferredName().equals(Constant.USER_NAME)) {
if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getStatus().equals("0")) { if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("0")) {
tvStatus.setText("调班状态：等待对方操作"); tvStatus.setText("调班状态：等待对方操作");
rg.setVisibility(View.GONE); rg.setVisibility(View.GONE);
submit.setVisibility(View.GONE); submit.setVisibility(View.GONE);
} else if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getStatus().equals("1")) { } else if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("1")) {
tvStatus.setVisibility(View.VISIBLE); tvStatus.setVisibility(View.VISIBLE);
tvStatus.setText("调班状态：对方同意了您的申请"); tvStatus.setText("调班状态：对方同意了您的申请");
rg.setVisibility(View.GONE); rg.setVisibility(View.GONE);
submit.setVisibility(View.GONE); submit.setVisibility(View.GONE);
} else if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getStatus().equals("2")) { } else if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("2")) {
tvStatus.setVisibility(View.VISIBLE); tvStatus.setVisibility(View.VISIBLE);
tvStatus.setText("调班状态：对方不同意您的申请"); tvStatus.setText("调班状态：对方不同意您的申请");
rg.setVisibility(View.GONE); rg.setVisibility(View.GONE);
submit.setVisibility(View.GONE); submit.setVisibility(View.GONE);
} }
} else if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getTransferredClass().equals(Constant.USER_NAME)) { } else if (dutiesTbResponses.get(0).getSuperior().getTransferredClass().equals(Constant.USER_NAME)) {
// 被换班人是我 // 被换班人是我
if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getStatus().equals("0")) { if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("0")) {
tvStatus.setVisibility(View.GONE); tvStatus.setVisibility(View.GONE);
} else if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getStatus().equals("1")) { } else if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("1")) {
tvStatus.setVisibility(View.VISIBLE); tvStatus.setVisibility(View.VISIBLE);
tvStatus.setText("调班状态：您同意了对方申请"); tvStatus.setText("调班状态：您同意了对方申请");
rg.setVisibility(View.GONE); rg.setVisibility(View.GONE);
submit.setVisibility(View.GONE); submit.setVisibility(View.GONE);
} else if (dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getStatus().equals("2")) { } else if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("2")) {
tvStatus.setVisibility(View.VISIBLE); tvStatus.setVisibility(View.VISIBLE);
tvStatus.setText("调班状态：您不同意了对方申请"); tvStatus.setText("调班状态：您不同意了对方申请");
rg.setVisibility(View.GONE); rg.setVisibility(View.GONE);
submit.setVisibility(View.GONE); submit.setVisibility(View.GONE);
} }
} }
reason.setText(dutiesTbResponses.get(0).getRefers().getCc_shift().get(0).getReason()); reason.setText(dutiesTbResponses.get(0).getSuperior().getReason());
} }
}, Throwable::printStackTrace); }, Throwable::printStackTrace);
...@@ -123,8 +123,8 @@ public class TiaobanDetailsActivity extends BaseActivity { ...@@ -123,8 +123,8 @@ public class TiaobanDetailsActivity extends BaseActivity {
private void initView() { private void initView() {
rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(RadioGroup radioGroup, int i) { public void onCheckedChanged(RadioGroup radioGroup, int checkId) {
switch (radioGroup.getId()) { switch (checkId) {
case R.id.agree: case R.id.agree:
// 修改status // 修改status
// 改值班表 // 改值班表
...@@ -144,7 +144,7 @@ public class TiaobanDetailsActivity extends BaseActivity { ...@@ -144,7 +144,7 @@ public class TiaobanDetailsActivity extends BaseActivity {
public void onViewClicked() { public void onViewClicked() {
if (status.equals("1")) { if (status.equals("1")) {
dutyPlanClient.ccShiftsEdit(ccShift_id,status).flatMap(new Function<CCShifts, ObservableSource<List<CCShiftsUni>>>() { dutyPlanClient.ccShiftsEdit(id,status).flatMap(new Function<CCShifts, ObservableSource<List<CCShiftsUni>>>() {
@Override @Override
public ObservableSource<List<CCShiftsUni>> apply(CCShifts ccShifts) throws Exception { public ObservableSource<List<CCShiftsUni>> apply(CCShifts ccShifts) throws Exception {
return dutyPlanClient.ccshiftUni(id); return dutyPlanClient.ccshiftUni(id);
...@@ -154,13 +154,13 @@ public class TiaobanDetailsActivity extends BaseActivity { ...@@ -154,13 +154,13 @@ public class TiaobanDetailsActivity extends BaseActivity {
public ObservableSource<CCDutiesEdit> apply(List<CCShiftsUni> ccShiftsUnis) throws Exception { public ObservableSource<CCDutiesEdit> apply(List<CCShiftsUni> ccShiftsUnis) throws Exception {
if (ccShiftsUnis.get(0).getSuperior().getTransferredClassTime().equals("0")) { if (ccShiftsUnis.get(0).getSuperior().getTransferredClassTime().equals("0")) {
String morning = ccShiftsUnis.get(0).getIncludes().getCc_duty().getMorning(); String morning = ccShiftsUnis.get(0).getIncludes().getCc_duty().getMorning();
return dutyPlanClient.editMorning(id, morning.replace(Constant.USER_NAME, ccShiftsUnis.get(0).getSuperior().getTransferredClass())); return dutyPlanClient.editMorning(cc_duty_id, morning.replace(ccShiftsUnis.get(0).getSuperior().getTransferredName(), ccShiftsUnis.get(0).getSuperior().getTransferredClass()));
} else if (ccShiftsUnis.get(0).getSuperior().getTransferredClassTime().equals("1")) { } else if (ccShiftsUnis.get(0).getSuperior().getTransferredClassTime().equals("1")) {
String noon = ccShiftsUnis.get(0).getIncludes().getCc_duty().getNoon(); String noon = ccShiftsUnis.get(0).getIncludes().getCc_duty().getNoon();
return dutyPlanClient.editNoon(id, noon.replace(Constant.USER_NAME, ccShiftsUnis.get(0).getSuperior().getTransferredClass())); return dutyPlanClient.editNoon(cc_duty_id, noon.replace(ccShiftsUnis.get(0).getSuperior().getTransferredName(), ccShiftsUnis.get(0).getSuperior().getTransferredClass()));
} else { } else {
String eve = ccShiftsUnis.get(0).getIncludes().getCc_duty().getEvening(); String eve = ccShiftsUnis.get(0).getIncludes().getCc_duty().getEvening();
return dutyPlanClient.editNight(id, eve.replace(Constant.USER_NAME, ccShiftsUnis.get(0).getSuperior().getTransferredClass())); return dutyPlanClient.editNight(cc_duty_id, eve.replace(ccShiftsUnis.get(0).getSuperior().getTransferredName(), ccShiftsUnis.get(0).getSuperior().getTransferredClass()));
} }
} }
}).subscribeOn(Schedulers.io()) }).subscribeOn(Schedulers.io())
......
app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaobanRecordActivity.java
View file @ 349c6026
...@@ -45,7 +45,7 @@ public class TiaobanRecordActivity extends BaseActivity { ...@@ -45,7 +45,7 @@ public class TiaobanRecordActivity extends BaseActivity {
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Intent intent = new Intent(TiaobanRecordActivity.this,TiaobanDetailsActivity.class); Intent intent = new Intent(TiaobanRecordActivity.this,TiaobanDetailsActivity.class);
intent.putExtra("id", ccShift.get(position).getApplicantDutyId()); intent.putExtra("id", ccShift.get(position).getId());
startActivity(intent); startActivity(intent);
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment