Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
DutyManager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
邢皓翔
DutyManager
Commits
72d46854
Commit
72d46854
authored
Apr 09, 2018
by
xinghx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coding
parent
6380adff
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
76 additions
and
34 deletions
+76
-34
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
TiaobanInfoAdapter.java
...n/java/cn/bsl/bxbg/zhiban/adapter/TiaobanInfoAdapter.java
+9
-1
DutyAPI.java
app/src/main/java/cn/bsl/bxbg/zhiban/net/api/DutyAPI.java
+4
-1
DutyPlanClient.java
...in/java/cn/bsl/bxbg/zhiban/net/client/DutyPlanClient.java
+5
-3
CCShifts.java
...c/main/java/cn/bsl/bxbg/zhiban/net/response/CCShifts.java
+3
-3
TiaoBanPublish.java
...src/main/java/cn/bsl/bxbg/zhiban/view/TiaoBanPublish.java
+53
-24
TiaobanDetailsActivity.java
.../java/cn/bsl/bxbg/zhiban/view/TiaobanDetailsActivity.java
+1
-1
No files found.
app/src/main/AndroidManifest.xml
View file @
72d46854
...
...
@@ -21,7 +21,7 @@
android:name=
".view.ZhibanInfoActivity"
android:label=
"值班信息"
/>
<activity
android:name=
".view.ZhibanTableActivity"
android:name=
".view.ZhibanTableActivity"
android:label=
"值班表"
/>
<activity
android:name=
".view.TiaobanRecordActivity"
...
...
app/src/main/java/cn/bsl/bxbg/zhiban/adapter/TiaobanInfoAdapter.java
View file @
72d46854
...
...
@@ -12,6 +12,7 @@ import butterknife.BindView;
import
butterknife.ButterKnife
;
import
cn.bsl.bxbg.zhiban.R
;
import
cn.bsl.bxbg.zhiban.net.response.CCShifts
;
import
cn.bsl.bxbg.zhiban.utils.Constant
;
/**
* Created by Xinghx on 2018/3/6 0006.
...
...
@@ -50,8 +51,15 @@ public class TiaobanInfoAdapter extends BaseAdapter {
}
else
{
holder
=
(
ViewHolder
)
convertView
.
getTag
();
}
String
transferredName
=
ccShiftses
.
get
(
position
).
getTransferredName
()+
""
;
String
transferedClass
=
ccShiftses
.
get
(
position
).
getTransferredClass
()+
""
;
if
(
transferedClass
.
equals
(
Constant
.
USER_NAME
))
{
holder
.
tbTitle
.
setText
(
transferredName
+
"的换班申请"
);
}
else
if
(
transferredName
.
equals
(
Constant
.
USER_NAME
)){
holder
.
tbTitle
.
setText
(
"与"
+
transferedClass
+
"的换班申请"
);
}
holder
.
tbName
.
setText
(
ccShiftses
.
get
(
position
).
getApplicant
());
holder
.
tbTime
.
setText
(
ccShiftses
.
get
(
position
).
get
Shift
Time
());
holder
.
tbTime
.
setText
(
ccShiftses
.
get
(
position
).
get
LastUpdate
Time
());
return
convertView
;
}
...
...
app/src/main/java/cn/bsl/bxbg/zhiban/net/api/DutyAPI.java
View file @
72d46854
...
...
@@ -48,9 +48,12 @@ public interface DutyAPI {
@Field
(
"applicantId"
)
String
applicantId
,
@Field
(
"applicant"
)
String
applicant
,
@Field
(
"transferredName"
)
String
transferredName
,
@Field
(
"transferredClass"
)
String
transferredClass
,
@Field
(
"applicantDutyId"
)
String
applicantDutyId
,
@Field
(
"reason"
)
String
reason
,
@Field
(
"shiftTime"
)
String
shiftTime
);
@Field
(
"shiftTime"
)
String
shiftTime
,
@Field
(
"status"
)
String
status
,
@Field
(
"transferredClassTime"
)
String
transferredClassTime
);
@FormUrlEncoded
@POST
(
"cc_duties/{id}/edit"
)
...
...
app/src/main/java/cn/bsl/bxbg/zhiban/net/client/DutyPlanClient.java
View file @
72d46854
...
...
@@ -41,9 +41,11 @@ public class DutyPlanClient extends BaseClient {
return
dutyAPI
.
dutiesById
(
Constant
.
USER_ID
+
""
,
id
);
}
public
Observable
<
TiaobanBean
>
tiaobanBean
(
String
transferredName
,
String
id
,
String
reason
,
String
dutyTime
)
{
// 调班申请默认为0 , 1为同意调班 2为不同意调班 // 手机端调班人和申请人为同一人
public
Observable
<
TiaobanBean
>
tiaobanBean
(
String
transferredName
,
String
id
,
String
reason
,
String
dutyTime
,
String
shift_timeStatus
)
{
return
dutyAPI
.
tbRecord
(
Constant
.
USER_ID
,
Constant
.
USER_ID
,
Constant
.
USER_NAME
,
transferredName
,
id
,
reason
,
dutyTime
);
Constant
.
USER_NAME
,
transferredName
,
id
,
reason
,
dutyTime
,
"0"
,
shift_timeStatus
);
}
public
Observable
<
CCDutiesEdit
>
editMorning
(
String
cc_id
,
String
morning
)
{
...
...
@@ -67,7 +69,7 @@ public class DutyPlanClient extends BaseClient {
}
public
Call
<
List
<
CCShifts
>>
shiftsRecord
()
{
return
dutyAPI
.
ccShifts
(
"1"
,
"1000"
,
"{'cc_shift':{'applicant
':{'equalTo':'"
+
Constant
.
USER_NAME
+
"'
}}}"
);
return
dutyAPI
.
ccShifts
(
"1"
,
"1000"
,
"{'cc_shift':{'applicant
TransferredNameequalTo':{'fieldsValuesOr':{'fields':['transferred_class','transferred_name'],'values':['"
+
Constant
.
USER_NAME
+
"']}
}}}"
);
}
}
app/src/main/java/cn/bsl/bxbg/zhiban/net/response/CCShifts.java
View file @
72d46854
...
...
@@ -29,7 +29,7 @@ public class CCShifts {
private
String
applicantId
;
private
String
applicant
;
private
String
transferredName
;
private
Object
transferredClass
;
private
String
transferredClass
;
private
String
shiftTime
;
private
String
applicantDutyId
;
private
Object
transferredClassTime
;
...
...
@@ -74,11 +74,11 @@ public class CCShifts {
this
.
transferredName
=
transferredName
;
}
public
Object
getTransferredClass
()
{
public
String
getTransferredClass
()
{
return
transferredClass
;
}
public
void
setTransferredClass
(
Object
transferredClass
)
{
public
void
setTransferredClass
(
String
transferredClass
)
{
this
.
transferredClass
=
transferredClass
;
}
...
...
app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaoBanPublish.java
View file @
72d46854
...
...
@@ -23,6 +23,7 @@ import cn.bsl.bxbg.zhiban.net.response.CCDutiesEdit;
import
cn.bsl.bxbg.zhiban.net.response.TiaobanBean
;
import
cn.bsl.bxbg.zhiban.utils.Constant
;
import
io.reactivex.ObservableSource
;
import
io.reactivex.Scheduler
;
import
io.reactivex.android.schedulers.AndroidSchedulers
;
import
io.reactivex.annotations.NonNull
;
import
io.reactivex.functions.Consumer
;
...
...
@@ -81,6 +82,31 @@ public class TiaoBanPublish extends BaseActivity {
}
}
private
void
tiaoBan
(
String
choose_person
,
String
choose_time
,
String
choose_reason
)
{
String
timeStatus
;
if
(
choose_time
.
equals
(
"08:30 - 12:00"
))
{
// morning
timeStatus
=
"0"
;
}
else
if
(
choose_time
.
equals
(
"12:00 - 18:30"
)){
// noon
timeStatus
=
"1"
;
}
else
{
// evening
timeStatus
=
"2"
;
}
dutyPlanClient
.
tiaobanBean
(
choose_person
,
id
,
choose_reason
,
dutyTime
,
timeStatus
)
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
new
Consumer
<
TiaobanBean
>()
{
@Override
public
void
accept
(
TiaobanBean
tiaobanBean
)
throws
Exception
{
Toast
.
makeText
(
TiaoBanPublish
.
this
,
"发起调班成功,请等待对方确认"
,
Toast
.
LENGTH_SHORT
).
show
();
finish
();
}
},
Throwable:
:
printStackTrace
);
}
private
void
submit
()
{
String
choose_person
=
chooseResult
.
getText
().
toString
();
String
choose_time
=
chooseTimeArea
.
getText
().
toString
();
...
...
@@ -97,31 +123,34 @@ public class TiaoBanPublish extends BaseActivity {
Toast
.
makeText
(
this
,
"请选择变更人"
,
Toast
.
LENGTH_SHORT
).
show
();
return
;
}
tiaoBan
(
choose_person
,
choose_time
,
choose_reason
);
// TODO the flatMap will delete
dutyPlanClient
.
tiaobanBean
(
choose_person
,
id
,
choose_reason
,
dutyT
ime
)
.
flatMap
(
new
Function
<
TiaobanBean
,
ObservableSource
<
CCDutiesEdit
>>()
{
@Override
public
ObservableSource
<
CCDutiesEdit
>
apply
(
@NonNull
TiaobanBean
tiaobanBean
)
throws
Exception
{
if
(
choose_time
.
equals
(
"08:30 - 12:00"
))
{
// morning
return
dutyPlanClient
.
editMorning
(
id
,
morning
.
replace
(
Constant
.
USER_NAME
,
choose_person
));
}
else
if
(
choose_time
.
equals
(
"12:00 - 18:30"
)){
// noon
return
dutyPlanClient
.
editNoon
(
id
,
noon
.
replace
(
Constant
.
USER_NAME
,
choose_person
));
}
else
{
// evening
return
dutyPlanClient
.
editNight
(
id
,
evening
.
replace
(
Constant
.
USER_NAME
,
choose_person
));
}
}
}).
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
new
Consumer
<
CCDutiesEdit
>()
{
@Override
public
void
accept
(
CCDutiesEdit
ccDutiesEdit
)
throws
Exception
{
Toast
.
makeText
(
TiaoBanPublish
.
this
,
"申请成功"
,
Toast
.
LENGTH_SHORT
).
show
();
finish
();
}
},
Throwable:
:
printStackTrace
);
// dutyPlanClient.tiaobanBean(choose_person,id,choose_reason,dutyTime,choose_t
ime)
//
.flatMap(new Function<TiaobanBean, ObservableSource<CCDutiesEdit>>() {
//
@Override
//
public ObservableSource<CCDutiesEdit> apply(@NonNull TiaobanBean tiaobanBean) throws Exception {
//
if (choose_time.equals("08:30 - 12:00")) {
//
// morning
//
return dutyPlanClient.editMorning(id, morning.replace(Constant.USER_NAME, choose_person));
//
} else if (choose_time.equals("12:00 - 18:30")){
//
// noon
//
return dutyPlanClient.editNoon(id, noon.replace(Constant.USER_NAME, choose_person));
//
} else {
//
// evening
//
return dutyPlanClient.editNight(id, evening.replace(Constant.USER_NAME, choose_person));
//
}
//
}
//
}).subscribeOn(Schedulers.io())
//
.observeOn(AndroidSchedulers.mainThread())
//
.subscribe(new Consumer<CCDutiesEdit>() {
//
@Override
//
public void accept(CCDutiesEdit ccDutiesEdit) throws Exception {
//
Toast.makeText(TiaoBanPublish.this, "申请成功", Toast.LENGTH_SHORT).show();
//
finish();
//
}
//
},Throwable::printStackTrace);
}
private
void
showTimeSelector
()
{
...
...
app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaobanDetailsActivity.java
View file @
72d46854
...
...
@@ -47,7 +47,7 @@ public class TiaobanDetailsActivity extends BaseActivity {
String
createTime
=
dutiesTbResponses
.
get
(
0
).
getRefers
().
getCc_shift
().
get
(
0
).
getCreateTime
();
String
dutyDate
=
dutiesTbResponses
.
get
(
0
).
getSuperior
().
getDutyDate
();
String
people
=
" 早:"
+
dutiesTbResponses
.
get
(
0
).
getSuperior
().
getMorning
()
+
"\n 中:"
+
dutiesTbResponses
.
get
(
0
).
getSuperior
().
getNoon
()
+
"\n 晚:"
+
dutiesTbResponses
.
get
(
0
).
getSuperior
().
getEvening
();
String
change
=
dutiesTbResponses
.
get
(
0
).
getRefers
().
getCc_shift
().
get
(
0
).
get
Applicant
()
+
" 变更为 "
+
dutiesTbResponses
.
get
(
0
).
getRefers
().
getCc_shift
().
get
(
0
).
getTransferredName
();
String
change
=
dutiesTbResponses
.
get
(
0
).
getRefers
().
getCc_shift
().
get
(
0
).
get
TransferredName
()
+
" 变更为 "
+
dutiesTbResponses
.
get
(
0
).
getRefers
().
getCc_shift
().
get
(
0
).
getTransferredClass
();
dutyTimes
.
setText
(
dutyDate
);
person
.
setText
(
people
);
changePerson
.
setText
(
change
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment