coding

.idea/gradle.xml

@@ -9,6 +9,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/treeview_lib" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/modules.xml

@@ -5,6 +5,7 @@
       <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$/treeview_lib/treeview_lib.iml" filepath="$PROJECT_DIR$/treeview_lib/treeview_lib.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "cn.bsl.bxbg.zhiban"
         minSdkVersion 22
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        versionCode 7
+        versionName "1.7.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         jackOptions {
             enabled true
@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
@@ -44,6 +44,9 @@ dependencies {
     compile 'io.reactivex.rxjava2:rxjava:2.1.0'
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    compile 'com.android.support:design:26.0.0-alpha1'
     testCompile 'junit:junit:4.12'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    compile project(':treeview_lib')
+    compile files('libs/xutils3.jar')
 }

app/src/main/AndroidManifest.xml

@@ -14,14 +14,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
             </intent-filter>
         </activity>
         <activity
             android:name=".view.ZhibanInfoActivity"
             android:label="值班信息" />
         <activity
-        android:name=".view.ZhibanTableActivity"
+            android:name=".view.ZhibanTableActivity"
             android:label="值班表" />
         <activity
             android:name=".view.TiaobanRecordActivity"
@@ -35,9 +35,19 @@
         <activity
             android:name=".view.TiaoBanPublish"
             android:label="调班申请" />
-        <activity android:name=".view.DutyChangePeopleActivity"
-            android:label="变更人选择"
+        <activity
+            android:name=".view.DutyChangePeopleActivity"
+            android:label="变更人选择" />
+        <activity
+            android:name=".view.WaitMeActivity"
+            android:label="待办事项" />
+        <activity android:name=".view.DutyTransferActivity"
+            android:label="交接班管理"
+            />
+        <activity android:name=".view.TakeOverDetailsActivity"
+            android:label="详情"
             />
+        <activity android:name=".view.AddMeetingPersonActivity2" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/aidl/com/bril/baoding/studio/aidl/GetUserid.aidl

+package com.bril.baoding.studio.aidl;
+
+interface GetUserid {
+	int getUserid();
+	String getUsername();
+}
\ No newline at end of file

app/src/main/java/cn/bsl/bxbg/zhiban/MyApplication.java

+package cn.bsl.bxbg.zhiban;
+
+import android.app.Application;
+
+import org.xutils.x;
+
+/**
+ * Created by Xinghx on 2018/5/18 0018.
+ */
+
+public class MyApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        x.Ext.init(this);
+        x.Ext.setDebug(BuildConfig.DEBUG);
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/adapter/PopAdapter.java

+/*
+ * PopAdapter.java
+ * classes : cn.com.bril.meeting.adapter.PopAdapter
+ * @author 李小娇
+ * V 1.0.0
+ * Create at 2016-10-9 下午2:19:58
+ */
+package cn.bsl.bxbg.zhiban.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import java.util.List;
+
+import cn.bsl.bxbg.zhiban.R;
+
+
+/**
+ * @title: PopAdapter.java
+ * @package：cn.com.bril.meeting.adapter.PopAdapter
+ * @description: TODO
+ * @author 李小娇
+ * @time：create at 2016-10-9 下午2:19:58
+ */
+public class PopAdapter extends BaseAdapter {
+	private static final String TAG = "PopAdapter";
+	private Context context;
+	private List<String> list;
+
+
+	public PopAdapter(Context context, List<String> list) {
+		this.context = context;
+		this.list = list;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see android.widget.Adapter#getCount()
+	 */
+	@Override
+	public int getCount() {
+		return list.size();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see android.widget.Adapter#getItem(int)
+	 */
+	@Override
+	public Object getItem(int position) {
+		return position;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see android.widget.Adapter#getItemId(int)
+	 */
+	@Override
+	public long getItemId(int position) {
+		return position;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see android.widget.Adapter#getView(int, android.view.View,
+	 * android.view.ViewGroup)
+	 */
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		ViewHolder holder = null;
+		if (convertView == null) {
+			holder = new ViewHolder();
+			convertView = LayoutInflater.from(context).inflate(R.layout.pop_item, null);
+			holder.checkBox = (CheckBox) convertView.findViewById(R.id.checkbox);
+			holder.tv_name = (TextView) convertView.findViewById(R.id.tv_name);
+			convertView.setTag(holder);
+		} else {
+			holder = (ViewHolder) convertView.getTag();
+		}
+		holder.tv_name.setText(list.get(position));
+		return convertView;
+	}
+
+	class ViewHolder {
+		CheckBox checkBox;
+		TextView tv_name;
+	}
+}

app/src/main/java/cn/bsl/bxbg/zhiban/adapter/ShiftAdapter.java

+package cn.bsl.bxbg.zhiban.adapter;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.bean.ShiftBean;
+
+/**
+ * Created by Xinghx on 2018/5/20 0020.
+ */
+
+public class ShiftAdapter extends BaseAdapter {
+    private List<ShiftBean> shiftBeen = new ArrayList<>();
+
+    public ShiftAdapter(List<ShiftBean> shiftBeen) {
+        this.shiftBeen = shiftBeen;
+    }
+
+    @Override
+    public int getCount() {
+        return shiftBeen.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        ViewHolder viewHolder = null;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_zhiban_info, parent, false);
+            viewHolder = new ViewHolder(convertView);
+            convertView.setTag(viewHolder);
+        } else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+        viewHolder.nextPeople.setText("下个值班人员:");
+        viewHolder.zbName.setText(shiftBeen.get(position).getSuccessor());
+        viewHolder.zbTime.setText(shiftBeen.get(position).getDutyDate());
+        viewHolder.zbTitle.setText(shiftBeen.get(position).getHandover()+"的值班");
+        return convertView;
+    }
+
+    static class ViewHolder {
+        @BindView(R.id.zb_title)
+        TextView zbTitle;
+        @BindView(R.id.zb_name)
+        TextView zbName;
+        @BindView(R.id.zb_time)
+        TextView zbTime;
+        @BindView(R.id.zb_name_title)
+        TextView nextPeople;
+
+        ViewHolder(View view) {
+            ButterKnife.bind(this, view);
+        }
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/adapter/TiaobanInfoAdapter.java

@@ -51,12 +51,13 @@ public class TiaobanInfoAdapter extends BaseAdapter {
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
+        String applicant = ccShiftses.get(position).getApplicant();
         String transferredName = ccShiftses.get(position).getTransferredName()+"";
         String transferedClass = ccShiftses.get(position).getTransferredClass()+"";
-        if (transferedClass.equals(Constant.USER_NAME)) {
+        if (transferredName.equals(Constant.USER_NAME)) {
             holder.tbTitle.setText(transferredName + "的换班申请");
-        } else if (transferredName.equals(Constant.USER_NAME)){
-            holder.tbTitle.setText("与" + transferedClass+"的换班申请");
+        } else if (applicant.equals(Constant.USER_NAME)){
+            holder.tbTitle.setText("与" + transferredName+"的换班申请");
         }
         holder.tbName.setText(ccShiftses.get(position).getApplicant());
         holder.tbTime.setText(ccShiftses.get(position).getLastUpdateTime());

app/src/main/java/cn/bsl/bxbg/zhiban/adapter/ZhibanInfoAdapter.java

@@ -13,6 +13,8 @@ import butterknife.ButterKnife;
 import cn.bsl.bxbg.zhiban.R;
 import cn.bsl.bxbg.zhiban.bean.DutyPlanDutiesBean;
 
+import static cn.bsl.bxbg.zhiban.R.id.zb_title;
+
 /**
  * Created by Xinghx on 2018/3/6 0006.
  */
@@ -49,14 +51,25 @@ public class ZhibanInfoAdapter extends BaseAdapter {
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
-
+        String type = dutyPlanResponses.get(position).getType();
+        switch (type) {
+            case "0":
+                holder.zbTitle.setText("值班(早)");
+                break;
+            case "1":
+                holder.zbTitle.setText("值班(中)");
+                break;
+            case "2":
+                holder.zbTitle.setText("值班(晚)");
+                break;
+        }
         holder.zbName.setText(dutyPlanResponses.get(position).getLeader());
         holder.zbTime.setText(dutyPlanResponses.get(position).getDutyDate());
         return convertView;
     }
 
     class ViewHolder {
-        @BindView(R.id.zb_title)
+        @BindView(zb_title)
         TextView zbTitle;
         @BindView(R.id.zb_name)
         TextView zbName;

app/src/main/java/cn/bsl/bxbg/zhiban/adapter/ZhibanTableAdapter.java

@@ -11,16 +11,16 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cn.bsl.bxbg.zhiban.R;
-import cn.bsl.bxbg.zhiban.bean.DutyPlanDutiesBean;
+import cn.bsl.bxbg.zhiban.net.response.CCDuties;
 
 /**
  * Created by Xinghx on 2018/3/6 0006.
  */
 
 public class ZhibanTableAdapter extends BaseAdapter {
-    private List<DutyPlanDutiesBean> testBeen;
+    private List<CCDuties> testBeen;
 
-    public ZhibanTableAdapter(List<DutyPlanDutiesBean> testBeen) {
+    public ZhibanTableAdapter(List<CCDuties> testBeen) {
         this.testBeen = testBeen;
     }
 
@@ -50,7 +50,7 @@ public class ZhibanTableAdapter extends BaseAdapter {
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
-        viewHolder.zbTableLeader.setText(testBeen.get(position).getDutyDate() + "\n 带班领导:" +testBeen.get(position).getLeader());
+        viewHolder.zbTableLeader.setText(testBeen.get(position).getDutyDate() + "\n 带班领导:" +testBeen.get(position).getClassLeaders());
 //        viewHolder.zbTableLeader.setText("\n2018-01-01" + "\n\n带班领导:" + testBeen.get(position).getLeader() + "\n");
         viewHolder.zao.setText(testBeen.get(position).getMorning());
         viewHolder.zhong.setText(testBeen.get(position).getNoon());

app/src/main/java/cn/bsl/bxbg/zhiban/bean/Dept.java

+/*
+ * Dept.java
+ * classes : cn.com.bril.announcement.entity.Group
+ * @author 李小娇
+ * V 1.0.0
+ * Create at 2016-9-25 下午4:53:26
+ */
+package cn.bsl.bxbg.zhiban.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @title: Dept.java
+ * @package：cn.com.bril.announcement.entity.Group
+ * @description: TODO
+ * @author 李小娇 
+ * @time：create at 2016-9-25 下午4:53:26
+ */
+public class Dept implements Serializable{
+  private static final String TAG = "Dept";
+  
+  private String id;
+  private String name;
+  private ArrayList<User> children;
+  private boolean isChecked;
+
+  public Dept(String id, String name) {
+      this.name = name;
+      this.id=id;
+      children = new ArrayList<User>();
+      this.isChecked = false;
+  }
+
+  public void setChecked(boolean isChecked) {
+      this.isChecked = isChecked;
+  }
+
+  public void toggle() {
+      this.isChecked = !this.isChecked;
+  }
+
+  public boolean getChecked() {
+      return this.isChecked;
+  }
+
+  public String getId() {
+      return id;
+  }
+
+  public String getName() {
+      return name;
+  }
+
+  public void addChildrenItem(User child) {
+      children.add(child);
+  }
+  
+  public void addChildrenAll(List<User> childs) {
+    children.addAll(childs);
+  }
+
+  public int getChildrenCount() {
+      return children.size();
+  }
+
+  public User getChildItem(int index) {
+      return children.get(index);
+  }
+
+  public ArrayList<User> getChildren() {
+    return this.children;
+  }
+
+  public void setChildren(ArrayList<User> children) {
+  this.children = children;}
+  
+  public void deleteChild(int poi){
+    children.remove(poi);
+  }
+  
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/DutyPlanDutiesBean.java

@@ -14,6 +14,7 @@ public class DutyPlanDutiesBean {
     private String evening;
     private String leader;
     private String dutyDate;
+    private String type;
 
     public String getPlanId() {
         return planId;
@@ -87,6 +88,14 @@ public class DutyPlanDutiesBean {
         this.dutyDate = dutyDate;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "DutyPlanDutiesBean{" +

app/src/main/java/cn/bsl/bxbg/zhiban/bean/Group.java

+/*
+ * Group.java
+ * classes : cn.com.bril.announcement.entity.Group
+ * @author 李小娇
+ * V 1.0.0
+ * Create at 2016-9-25 下午4:53:26
+ */
+package cn.bsl.bxbg.zhiban.bean;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class Group implements Serializable {
+	private static final String TAG = "Group";
+
+	private String id;
+	private String dept;
+	private ArrayList<SppUser> users;
+	private boolean isChecked;
+
+	public Group(String id, String name) {
+		this.dept = name;
+		users = new ArrayList<SppUser>();
+		this.isChecked = false;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setChecked(boolean isChecked) {
+		this.isChecked = isChecked;
+	}
+
+	public void toggle() {
+		this.isChecked = !this.isChecked;
+	}
+
+	public boolean getChecked() {
+		return this.isChecked;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getName() {
+		return dept;
+	}
+
+	public void addChildrenItem(SppUser child) {
+		users.add(child);
+	}
+
+	public int getChildrenCount() {
+		return users.size();
+	}
+
+	public SppUser getChildItem(int index) {
+		return users.get(index);
+	}
+
+	public ArrayList<SppUser> getChildren() {
+		return users;
+	}
+
+	public void setChildren(ArrayList<SppUser> children) {
+		this.users = children;
+	}
+
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/GroupPeople.java

+package cn.bsl.bxbg.zhiban.bean;
+
+import java.util.List;
+
+/**
+ * 
+ * @Title: GroupPeople.java
+ * @Package cn.bsl.bxbg.oa.ui.meeting.bean
+ * @Description: 群组人员 返回数据
+ * @author 郝晓聪
+ * @date 2016年12月19日 下午1:44:28
+ */
+public class GroupPeople {
+	private String titleName;
+
+	private List<IdentityUser> identityUser;
+
+	public void setTitleName(String titleName) {
+		this.titleName = titleName;
+	}
+
+	public String getTitleName() {
+		return this.titleName;
+	}
+
+	public void setIdentityUser(List<IdentityUser> identityUser) {
+		this.identityUser = identityUser;
+	}
+
+	public List<IdentityUser> getIdentityUser() {
+		return this.identityUser;
+	}
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/IdentityUser.java

+package cn.bsl.bxbg.zhiban.bean;
+
+public class IdentityUser {
+	private int id;
+
+	private int userid;
+
+	private String usename;
+	private String depatcode;
+
+	private String identityId;
+
+	private String deParentDeptCode;
+
+	private String title;
+
+	private String titlename;
+
+	private String udrCoMid;
+
+	private String identityCode;
+
+	private String identitytype;
+
+	public String getUsename() {
+		return usename;
+	}
+
+	public void setUsename(String usename) {
+		this.usename = usename;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public int getId() {
+		return this.id;
+	}
+
+	public void setUserid(int userid) {
+		this.userid = userid;
+	}
+
+	public int getUserid() {
+		return this.userid;
+	}
+
+	public void setDepatcode(String depatcode) {
+		this.depatcode = depatcode;
+	}
+
+	public String getDepatcode() {
+		return this.depatcode;
+	}
+
+	public void setIdentityId(String identityId) {
+		this.identityId = identityId;
+	}
+
+	public String getIdentityId() {
+		return this.identityId;
+	}
+
+	public void setDeParentDeptCode(String deParentDeptCode) {
+		this.deParentDeptCode = deParentDeptCode;
+	}
+
+	public String getDeParentDeptCode() {
+		return this.deParentDeptCode;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getTitle() {
+		return this.title;
+	}
+
+	public void setTitlename(String titlename) {
+		this.titlename = titlename;
+	}
+
+	public String getTitlename() {
+		return this.titlename;
+	}
+
+	public void setUdrCoMid(String udrCoMid) {
+		this.udrCoMid = udrCoMid;
+	}
+
+	public String getUdrCoMid() {
+		return this.udrCoMid;
+	}
+
+	public void setIdentityCode(String identityCode) {
+		this.identityCode = identityCode;
+	}
+
+	public String getIdentityCode() {
+		return this.identityCode;
+	}
+
+	public void setIdentitytype(String identitytype) {
+		this.identitytype = identitytype;
+	}
+
+	public String getIdentitytype() {
+		return this.identitytype;
+	}
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/ShiftBean.java

+package cn.bsl.bxbg.zhiban.bean;
+
+/**
+ * Created by Xinghx on 2018/5/20 0020.
+ */
+
+public class ShiftBean {
+
+    /**
+     * id : b8797ea8367843c1bcf80b6c922b3158
+     * ccDutyId : 4435208a43554a6aa823759a40fb735b
+     * handover : 赵睿
+     * successor : 卜海军
+     * successorTime :
+     * dutyContent :
+     * createTime : 2018-05-20 11:45:58
+     * lastUpdateTime : 2018-05-20 11:45:58
+     * remark : 0
+     * dutyDepartment :
+     * dutyDate : 2018-05-21
+     * dutyShift : 1
+     */
+
+    private String id;
+    private String ccDutyId;
+    private String handover;
+    private String successor;
+    private String successorTime;
+    private String dutyContent;
+    private String createTime;
+    private String lastUpdateTime;
+    private String remark;
+    private String dutyDepartment;
+    private String dutyDate;
+    private String dutyShift;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCcDutyId() {
+        return ccDutyId;
+    }
+
+    public void setCcDutyId(String ccDutyId) {
+        this.ccDutyId = ccDutyId;
+    }
+
+    public String getHandover() {
+        return handover;
+    }
+
+    public void setHandover(String handover) {
+        this.handover = handover;
+    }
+
+    public String getSuccessor() {
+        return successor;
+    }
+
+    public void setSuccessor(String successor) {
+        this.successor = successor;
+    }
+
+    public String getSuccessorTime() {
+        return successorTime;
+    }
+
+    public void setSuccessorTime(String successorTime) {
+        this.successorTime = successorTime;
+    }
+
+    public String getDutyContent() {
+        return dutyContent;
+    }
+
+    public void setDutyContent(String dutyContent) {
+        this.dutyContent = dutyContent;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getLastUpdateTime() {
+        return lastUpdateTime;
+    }
+
+    public void setLastUpdateTime(String lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getDutyDepartment() {
+        return dutyDepartment;
+    }
+
+    public void setDutyDepartment(String dutyDepartment) {
+        this.dutyDepartment = dutyDepartment;
+    }
+
+    public String getDutyDate() {
+        return dutyDate;
+    }
+
+    public void setDutyDate(String dutyDate) {
+        this.dutyDate = dutyDate;
+    }
+
+    public String getDutyShift() {
+        return dutyShift;
+    }
+
+    public void setDutyShift(String dutyShift) {
+        this.dutyShift = dutyShift;
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/SppUser.java

+/*
+ * SppUser.java
+ * classes : cn.com.bril.announcement.entity.Child
+ * @author 李小娇
+ * V 1.0.0
+ * Create at 2016-9-25 下午4:53:36
+ */
+package cn.bsl.bxbg.zhiban.bean;
+
+import java.io.Serializable;
+
+/**
+ * @title: SppUser.java
+ * @package：cn.com.bril.announcement.entity.Child
+ * @description: TODO
+ * @author 李小娇
+ * @time：create at 2016-9-25 下午4:53:36
+ */
+public class SppUser implements Serializable {
+	private static final String TAG = "SppUser";
+
+	private boolean isChecked;
+
+	private int userid;// 用户id
+	private String loginname; // 接收人登录账号
+	private String username; // 接受人名
+	private String rolename; // 角色
+	private String departname; // 部门
+
+	public SppUser(int userid, String rolename, String username) {
+		this.userid = userid;
+		this.rolename = rolename;
+		this.username = username;
+		this.isChecked = false;
+	}
+
+	public void setChecked(boolean isChecked) {
+		this.isChecked = isChecked;
+	}
+
+	public void toggle() {
+		this.isChecked = !this.isChecked;
+	}
+
+	public boolean getChecked() {
+		return this.isChecked;
+	}
+
+	public boolean isChecked() {
+		return isChecked;
+	}
+
+	public int getUserid() {
+		return userid;
+	}
+
+	public void setUserid(int userid) {
+		this.userid = userid;
+	}
+
+	public String getLoginname() {
+		return loginname;
+	}
+
+	public void setLoginname(String loginname) {
+		this.loginname = loginname;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getRolename() {
+		return rolename;
+	}
+
+	public void setRolename(String rolename) {
+		this.rolename = rolename;
+	}
+
+	public String getDepartname() {
+		return departname;
+	}
+
+	public void setDepartname(String departname) {
+		this.departname = departname;
+	}
+
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/TimeBean.java

+package cn.bsl.bxbg.zhiban.bean;
+
+/**
+ * Created by Xinghx on 2018/5/18 0018.
+ */
+
+public class TimeBean {
+
+    /**
+     * systemDate : 2018-05-18 10:08:34
+     * systemTime : 1526609314768
+     */
+
+    private String systemDate;
+    private long systemTime;
+
+    public String getSystemDate() {
+        return systemDate;
+    }
+
+    public void setSystemDate(String systemDate) {
+        this.systemDate = systemDate;
+    }
+
+    public long getSystemTime() {
+        return systemTime;
+    }
+
+    public void setSystemTime(long systemTime) {
+        this.systemTime = systemTime;
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/bean/User.java

+/*
+ * User.java
+ * classes : cn.com.bril.announcement.entity.Child
+ * @author 李小娇
+ * V 1.0.0
+ * Create at 2016-9-25 下午4:53:36
+ */
+package cn.bsl.bxbg.zhiban.bean;
+
+import java.io.Serializable;
+
+/**
+ * @title: User.java
+ * @package：cn.com.bril.announcement.entity.Child
+ * @description: TODO
+ * @author 李小娇
+ * @time：create at 2016-9-25 下午4:53:36
+ */
+public class User implements Serializable {
+  private static final String TAG = "User";
+
+  private String userid;
+  private String rolecode;
+  private String rolename;
+  private String username;
+  private boolean isChecked;
+  private String deptname;
+  private String deptcode;
+  private String status;
+
+  public User(String userid, String username, String rolecode, String rolename) {
+    this.userid = userid;
+    this.rolecode = rolecode;
+    this.rolename = rolename;
+    this.username = username;
+    this.isChecked = false;
+  }
+
+  public void setChecked(boolean isChecked) {
+    this.isChecked = isChecked;
+  }
+
+  public void toggle() {
+    this.isChecked = !this.isChecked;
+  }
+
+  public boolean getChecked() {
+    return this.isChecked;
+  }
+
+  public String getUserid() {
+    return userid;
+  }
+
+  public String getRolecode() {
+    return this.rolecode;
+  }
+
+  public void setRolecode(String rolecode) {
+    this.rolecode = rolecode;
+  }
+
+  public String getRolename() {
+    return this.rolename;
+  }
+
+  public void setRolename(String rolename) {
+    this.rolename = rolename;
+  }
+
+  public boolean isChecked() {
+    return this.isChecked;
+  }
+
+  public void setUserid(String userid) {
+    this.userid = userid;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public String getDeptname() {
+    return this.deptname;
+  }
+
+  public void setDeptname(String deptname) {
+    this.deptname = deptname;
+  }
+
+  public String getDeptcode() {
+    return this.deptcode;
+  }
+
+  public void setDeptcode(String deptcode) {
+    this.deptcode = deptcode;
+  }
+
+  public String getStatus() {
+    return this.status;
+  }
+
+  public void setStatus(String status) {
+  this.status = status;}
+  
+
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/AlreadyTakeOverFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.ShiftAdapter;
+import cn.bsl.bxbg.zhiban.bean.ShiftBean;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.utils.Constant;
+import cn.bsl.bxbg.zhiban.utils.DateUtils;
+import cn.bsl.bxbg.zhiban.view.TakeOverDetailsActivity;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Created by Xinghx on 2018/5/20 0020.
+ */
+
+public class AlreadyTakeOverFragment extends BaseFragment implements AdapterView.OnItemClickListener{
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+    @BindView(R.id.none)
+    TextView none;
+    Unbinder unbinder;
+    private View rootView;
+    private List<ShiftBean> shiftBeen = new ArrayList<>();
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+        initData();
+        return rootView;
+
+    }
+
+    private void initData() {
+        dutyPlanClient.shiftList(DateUtils.getMonth(), Constant.USER_NAME,"handover")
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(shiftBeen -> {
+                    this.shiftBeen.clear();
+                    for (int i = 0; i < shiftBeen.size(); i++) {
+                        if (shiftBeen.get(i).getRemark().equals("2")) {
+                            this.shiftBeen.add(shiftBeen.get(i));
+                        }
+                    }
+
+                    notFinishLv.setAdapter(new ShiftAdapter(this.shiftBeen));
+                    notFinishLv.setOnItemClickListener(this);
+                },Throwable::printStackTrace);
+    }
+
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(), TakeOverDetailsActivity.class);
+        intent.putExtra("id", shiftBeen.get(position).getId());
+        intent.putExtra("status", shiftBeen.get(position).getRemark());
+        intent.putExtra("dutyTime", shiftBeen.get(position).getDutyDate());
+        intent.putExtra("dutyShift", shiftBeen.get(position).getDutyShift());
+        intent.putExtra("dutyContent", shiftBeen.get(position).getDutyContent());
+        startActivityForResult(intent, 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        initData();
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/BaseFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.support.v4.app.Fragment;
+
+/**
+ * Created by Xinghx on 2018/4/15 0015.
+ */
+
+public class BaseFragment extends Fragment {
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/TiaoBanFinishFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.TiaobanInfoAdapter;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import cn.bsl.bxbg.zhiban.net.response.CCShiftsInclude;
+import cn.bsl.bxbg.zhiban.view.TiaobanDetailsActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * Created by Xinghx on 2018/4/15 0015.
+ */
+
+public class TiaoBanFinishFragment extends BaseFragment implements AdapterView.OnItemClickListener{
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    View rootView;
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+    @BindView(R.id.none)
+    TextView none;
+
+    Unbinder unbinder;
+    private List<CCShifts> ccShift;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+        initData();
+        notFinishLv.setOnItemClickListener(this);
+        return rootView;
+    }
+
+    private void initData() {
+        dutyPlanClient.shiftFinish().enqueue(new Callback<List<CCShiftsInclude>>() {
+            @Override
+            public void onResponse(Call<List<CCShiftsInclude>> call, Response<List<CCShiftsInclude>> response) {
+                List<CCShiftsInclude> body = response.body();
+                ccShift = new ArrayList<>();
+                for (CCShiftsInclude ccShiftsInclude : body) {
+                    CCShiftsInclude.IncludesBean.CcDutyBean cc_duty = ccShiftsInclude.getIncludes().getCc_duty();
+                    if (cc_duty != null) {
+
+                        CCShifts ccShifts = new CCShifts();
+                        ccShifts.setId(ccShiftsInclude.getSuperior().getId());
+                        ccShifts.setApplicantId(ccShiftsInclude.getSuperior().getApplicantId());
+                        ccShifts.setApplicant(ccShiftsInclude.getSuperior().getApplicant());
+                        ccShifts.setTransferredName(ccShiftsInclude.getSuperior().getTransferredName());
+                        ccShifts.setTransferredClass(ccShiftsInclude.getSuperior().getTransferredClass());
+                        ccShifts.setShiftTime(ccShiftsInclude.getSuperior().getShiftTime());
+                        ccShifts.setApplicantDutyId(ccShiftsInclude.getSuperior().getApplicantDutyId());
+                        ccShifts.setLastUpdateTime(ccShiftsInclude.getSuperior().getLastUpdateTime());
+                        ccShift.add(ccShifts);
+                    }
+                }
+                if (ccShift != null && ccShift.size() > 0) {
+                    notFinishLv.setAdapter(new TiaobanInfoAdapter(ccShift));
+                }
+            }
+
+            @Override
+            public void onFailure(Call<List<CCShiftsInclude>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(),TiaobanDetailsActivity.class);
+        intent.putExtra("id", ccShift.get(position).getId());
+        startActivity(intent);
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/TiaoBanNotFinishFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.TiaobanInfoAdapter;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import cn.bsl.bxbg.zhiban.net.response.CCShiftsInclude;
+import cn.bsl.bxbg.zhiban.view.TiaobanDetailsActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * Created by Xinghx on 2018/4/15
+ */
+
+public class TiaoBanNotFinishFragment extends BaseFragment implements AdapterView.OnItemClickListener{
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    View rootView;
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+    @BindView(R.id.none)
+    TextView none;
+
+    Unbinder unbinder;
+    private List<CCShifts> ccShift;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+        initData();
+        notFinishLv.setOnItemClickListener(this);
+        return rootView;
+    }
+
+    private void initData() {
+        dutyPlanClient.shiftInclNotFinish().enqueue(new Callback<List<CCShiftsInclude>>() {
+            @Override
+            public void onResponse(Call<List<CCShiftsInclude>> call, Response<List<CCShiftsInclude>> response) {
+                List<CCShiftsInclude> body = response.body();
+                ccShift = new ArrayList<>();
+                for (CCShiftsInclude ccShiftsInclude : body) {
+                    CCShiftsInclude.IncludesBean.CcDutyBean cc_duty = ccShiftsInclude.getIncludes().getCc_duty();
+                    if (cc_duty != null) {
+
+                        CCShifts ccShifts = new CCShifts();
+                        ccShifts.setId(ccShiftsInclude.getSuperior().getId());
+                        ccShifts.setApplicantId(ccShiftsInclude.getSuperior().getApplicantId());
+                        ccShifts.setApplicant(ccShiftsInclude.getSuperior().getApplicant());
+                        ccShifts.setTransferredName(ccShiftsInclude.getSuperior().getTransferredName());
+                        ccShifts.setTransferredClass(ccShiftsInclude.getSuperior().getTransferredClass());
+                        ccShifts.setShiftTime(ccShiftsInclude.getSuperior().getShiftTime());
+                        ccShifts.setApplicantDutyId(ccShiftsInclude.getSuperior().getApplicantDutyId());
+                        ccShifts.setLastUpdateTime(ccShiftsInclude.getSuperior().getLastUpdateTime());
+                        ccShift.add(ccShifts);
+                    }
+                }
+//                ccShift = response.body();
+                if (ccShift != null && ccShift.size() > 0) {
+                    notFinishLv.setAdapter(new TiaobanInfoAdapter(ccShift));
+                }
+            }
+
+            @Override
+            public void onFailure(Call<List<CCShiftsInclude>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(),TiaobanDetailsActivity.class);
+        intent.putExtra("id", ccShift.get(position).getId());
+        startActivity(intent);
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/WaitMeFinishFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.TiaobanInfoAdapter;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import cn.bsl.bxbg.zhiban.net.response.CCShiftsInclude;
+import cn.bsl.bxbg.zhiban.view.TiaobanDetailsActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * Created by Xinghx on 2018/4/15 0015.
+ */
+
+public class WaitMeFinishFragment extends BaseFragment implements AdapterView.OnItemClickListener {
+    private static final String TAG = "WaitMeFinishFragment";
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+    Unbinder unbinder;
+    @BindView(R.id.none)
+    TextView none;
+    private View rootView;
+
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    private List<CCShifts> ccShiftses;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+        initData();
+        notFinishLv.setOnItemClickListener(this);
+        return rootView;
+
+    }
+
+
+    private void initData() {
+        dutyPlanClient.shiftWaitMe("1").enqueue(new Callback<List<CCShiftsInclude>>() {
+            @Override
+            public void onResponse(Call<List<CCShiftsInclude>> call, Response<List<CCShiftsInclude>> response) {
+                List<CCShiftsInclude> body = response.body();
+                ccShiftses = new ArrayList<>();
+                for (CCShiftsInclude ccShiftsInclude : body) {
+                    CCShiftsInclude.IncludesBean.CcDutyBean cc_duty = ccShiftsInclude.getIncludes().getCc_duty();
+                    if (cc_duty != null) {
+
+                        CCShifts ccShifts = new CCShifts();
+                        ccShifts.setId(ccShiftsInclude.getSuperior().getId());
+                        ccShifts.setApplicantId(ccShiftsInclude.getSuperior().getApplicantId());
+                        ccShifts.setApplicant(ccShiftsInclude.getSuperior().getApplicant());
+                        ccShifts.setTransferredName(ccShiftsInclude.getSuperior().getTransferredName());
+                        ccShifts.setTransferredClass(ccShiftsInclude.getSuperior().getTransferredClass());
+                        ccShifts.setShiftTime(ccShiftsInclude.getSuperior().getShiftTime());
+                        ccShifts.setApplicantDutyId(ccShiftsInclude.getSuperior().getApplicantDutyId());
+                        ccShifts.setLastUpdateTime(ccShiftsInclude.getSuperior().getLastUpdateTime());
+                        ccShiftses.add(ccShifts);
+                    }
+                }
+                if (ccShiftses != null && ccShiftses.size() > 0) {
+                    TiaobanInfoAdapter adapter = new TiaobanInfoAdapter(ccShiftses);
+                    notFinishLv.setAdapter(adapter);
+                } else {
+                    notFinishLv.setVisibility(View.GONE);
+                    none.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void onFailure(Call<List<CCShiftsInclude>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(), TiaobanDetailsActivity.class);
+        intent.putExtra("id", ccShiftses.get(position).getId());
+        startActivity(intent);
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/WaitMeNotFinishFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.TiaobanInfoAdapter;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import cn.bsl.bxbg.zhiban.net.response.CCShiftsInclude;
+import cn.bsl.bxbg.zhiban.view.TiaobanDetailsActivity;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+/**
+ * Created by Xinghx on 2018/4/15 0015.
+ */
+
+public class WaitMeNotFinishFragment extends BaseFragment implements AdapterView.OnItemClickListener{
+
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+
+    Unbinder unbinder;
+    private View rootView;
+    private List<CCShifts> ccShiftses;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+        notFinishLv.setOnItemClickListener(this);
+        initData();
+        return rootView;
+    }
+
+    private void initData() {
+        dutyPlanClient.shiftWaitMe("0").enqueue(new Callback<List<CCShiftsInclude>>() {
+            @Override
+            public void onResponse(Call<List<CCShiftsInclude>> call, Response<List<CCShiftsInclude>> response) {
+                List<CCShiftsInclude> body = response.body();
+                ccShiftses = new ArrayList<>();
+                for (CCShiftsInclude ccShiftsInclude : body) {
+                    CCShiftsInclude.IncludesBean.CcDutyBean cc_duty = ccShiftsInclude.getIncludes().getCc_duty();
+                    if (cc_duty != null) {
+
+                        CCShifts ccShifts = new CCShifts();
+                        ccShifts.setId(ccShiftsInclude.getSuperior().getId());
+                        ccShifts.setApplicantId(ccShiftsInclude.getSuperior().getApplicantId());
+                        ccShifts.setApplicant(ccShiftsInclude.getSuperior().getApplicant());
+                        ccShifts.setTransferredName(ccShiftsInclude.getSuperior().getTransferredName());
+                        ccShifts.setTransferredClass(ccShiftsInclude.getSuperior().getTransferredClass());
+                        ccShifts.setShiftTime(ccShiftsInclude.getSuperior().getShiftTime());
+                        ccShifts.setApplicantDutyId(ccShiftsInclude.getSuperior().getApplicantDutyId());
+                        ccShifts.setLastUpdateTime(ccShiftsInclude.getSuperior().getLastUpdateTime());
+                        ccShiftses.add(ccShifts);
+                    }
+                }
+                if (ccShiftses != null || ccShiftses.size() > 0) {
+                    TiaobanInfoAdapter adapter = new TiaobanInfoAdapter(ccShiftses);
+                    notFinishLv.setAdapter(adapter);
+
+                }
+            }
+
+            @Override
+            public void onFailure(Call<List<CCShiftsInclude>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(),TiaobanDetailsActivity.class);
+        intent.putExtra("id", ccShiftses.get(position).getId());
+        startActivity(intent);
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/WaitShiftFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.ShiftAdapter;
+import cn.bsl.bxbg.zhiban.bean.ShiftBean;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.utils.Constant;
+import cn.bsl.bxbg.zhiban.utils.DateUtils;
+import cn.bsl.bxbg.zhiban.view.TakeOverDetailsActivity;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Created by Xinghx on 2018/5/20 0020.
+ */
+
+public class WaitShiftFragment extends BaseFragment implements AdapterView.OnItemClickListener{
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+    @BindView(R.id.none)
+    TextView none;
+    private Unbinder unbinder;
+    private View rootView;
+    private List<ShiftBean> shiftBeen = new ArrayList<>();
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+
+        initData();
+        return rootView;
+    }
+
+    private void initData() {
+        dutyPlanClient.shiftList(DateUtils.getMonth(), Constant.USER_NAME,"handover")
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(shiftBeen -> {
+                    this.shiftBeen.clear();
+                    for (int i = 0; i < shiftBeen.size(); i++) {
+                        if (shiftBeen.get(i).getRemark().equals("1")) {
+                            this.shiftBeen.add(shiftBeen.get(i));
+                        }
+                    }
+
+                    notFinishLv.setAdapter(new ShiftAdapter(this.shiftBeen));
+                    notFinishLv.setOnItemClickListener(this);
+                },Throwable::printStackTrace);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(), TakeOverDetailsActivity.class);
+        intent.putExtra("id", shiftBeen.get(position).getId());
+        intent.putExtra("status", shiftBeen.get(position).getRemark());
+        intent.putExtra("dutyTime", shiftBeen.get(position).getDutyDate());
+        intent.putExtra("dutyShift", shiftBeen.get(position).getDutyShift());
+        intent.putExtra("dutyContent", shiftBeen.get(position).getDutyContent());
+        startActivityForResult(intent, 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        initData();
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/fragment/WaitTakeOverFragment.java

+package cn.bsl.bxbg.zhiban.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.ShiftAdapter;
+import cn.bsl.bxbg.zhiban.bean.ShiftBean;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.utils.Constant;
+import cn.bsl.bxbg.zhiban.utils.DateUtils;
+import cn.bsl.bxbg.zhiban.view.TakeOverDetailsActivity;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Created by Xinghx on 2018/5/20 0020.
+ */
+
+public class WaitTakeOverFragment extends BaseFragment implements AdapterView.OnItemClickListener{
+    @BindView(R.id.not_finish_lv)
+    ListView notFinishLv;
+    @BindView(R.id.none)
+    TextView none;
+    Unbinder unbinder;
+    private View rootView;
+
+    private List<ShiftBean> shiftBeen = new ArrayList<>();
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        rootView = inflater.inflate(R.layout.waitme_fragment, container, false);
+        unbinder = ButterKnife.bind(this, rootView);
+        initData();
+        return rootView;
+    }
+
+    private void initData() {
+        dutyPlanClient.shiftList(DateUtils.getMonth(), Constant.USER_NAME,"successor")
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(shiftBeen -> {
+                    this.shiftBeen.clear();
+                    for (int i = 0; i < shiftBeen.size(); i++) {
+                        if (shiftBeen.get(i).getRemark().equals("0")) {
+                            this.shiftBeen.add(shiftBeen.get(i));
+                        }
+                    }
+
+                    notFinishLv.setAdapter(new ShiftAdapter(this.shiftBeen));
+                    notFinishLv.setOnItemClickListener(this);
+                },Throwable::printStackTrace);
+    }
+
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        unbinder.unbind();
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Intent intent = new Intent(getActivity(), TakeOverDetailsActivity.class);
+        intent.putExtra("id", shiftBeen.get(position).getId());
+        intent.putExtra("status", shiftBeen.get(position).getRemark());
+        intent.putExtra("dutyTime", shiftBeen.get(position).getDutyDate());
+        intent.putExtra("dutyShift", shiftBeen.get(position).getDutyShift());
+        intent.putExtra("dutyContent", shiftBeen.get(position).getDutyContent());
+        startActivityForResult(intent, 0);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        initData();
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/listener/OnAddUserCountListener.java

+package cn.bsl.bxbg.zhiban.listener;
+
+public interface OnAddUserCountListener {
+
+	public void OnAddUserCountListener(int num);
+}

app/src/main/java/cn/bsl/bxbg/zhiban/net/api/DutyAPI.java

@@ -2,9 +2,12 @@ package cn.bsl.bxbg.zhiban.net.api;
 
 import java.util.List;
 
+import cn.bsl.bxbg.zhiban.bean.ShiftBean;
+import cn.bsl.bxbg.zhiban.bean.TimeBean;
 import cn.bsl.bxbg.zhiban.net.response.CCDuties;
 import cn.bsl.bxbg.zhiban.net.response.CCDutiesEdit;
 import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import cn.bsl.bxbg.zhiban.net.response.CCShiftsInclude;
 import cn.bsl.bxbg.zhiban.net.response.CCShiftsUni;
 import cn.bsl.bxbg.zhiban.net.response.DutiesTbResponse;
 import cn.bsl.bxbg.zhiban.net.response.DutyPlanResponse;
@@ -33,16 +36,23 @@ public interface DutyAPI {
     @GET("cc_duties")
     Observable<List<CCDuties>> dutiesRecord(@Query("pageNo") String pageNo,
                                             @Query("pageSize") String pageSize,
-                                            @Query("sortItem") String filters);
+                                            @Query("sortItem") String sortItem,
+                                            @Query("filters") String filters);
 
     @GET("cc_duties/{id}")
     Observable<CCDuties> dutiesById(@Header("X-Auth-Token") String header,
-                                          @Path("id") String id);
+                                    @Path("id") String id);
 
     @FormUrlEncoded
     @POST("roleManagerController.do")
     Call<ResponseBody> people(@Field("method") String method, @Field("userId") String userId);
 
+    @FormUrlEncoded
+    @POST("return_department_people")
+    Call<ResponseBody> getAllpeople(@Field("userId") String userId);
+
+
+
     @FormUrlEncoded
     @POST("cc_shifts/new")
     Observable<TiaobanBean> tbRecord(@Header("X-Auth-Token") String header,
@@ -54,7 +64,8 @@ public interface DutyAPI {
                                      @Field("reason") String reason,
                                      @Field("shiftTime") String shiftTime,
                                      @Field("status") String status,
-                                     @Field("transferredClassTime") String transferredClassTime);
+                                     @Field("transferredClassTime") String transferredClassTime,
+                                     @Field("applicantPosition") String applicatPosition);
 
     @FormUrlEncoded
     @POST("cc_duties/{id}/edit")
@@ -65,39 +76,103 @@ public interface DutyAPI {
     @FormUrlEncoded
     @POST("cc_duties/{id}/edit")
     Observable<CCDutiesEdit> editNoon(@Header("X-Auth-Token") String header,
-                                         @Path("id") String cc_duty_id,
-                                         @Field("noon") String noon);
+                                      @Path("id") String cc_duty_id,
+                                      @Field("noon") String noon);
 
     @FormUrlEncoded
     @POST("cc_duties/{id}/edit")
     Observable<CCDutiesEdit> editNight(@Header("X-Auth-Token") String header,
                                        @Path("id") String cc_duty_id,
-                                         @Field("night") String night);
+                                       @Field("night") String night);
+
+    @FormUrlEncoded
+    @POST("cc_duties/{id}/edit")
+    Observable<CCDutiesEdit> editLeader(@Header("X-Auth-Token") String header,
+                                        @Path("id") String cc_duty_id,
+                                        @Field("classLeaders") String leader);
 
     @GET("cc_duties")
     Observable<List<DutiesTbResponse>> dutiesTb(@Query("pageNo") String pageNo,
-                                          @Query("pageSize") String pageSize,
-                                          @Query("refers") String refers);
+                                                @Query("pageSize") String pageSize,
+                                                @Query("refers") String refers);
 
     @GET("cc_shifts")
     Observable<List<DutiesTbResponse>> dutiesTbDetails(@Query("pageNo") String pageNo,
-                                                @Query("pageSize") String pageSize,
-                                                @Query("filters") String filters,
-                                                @Query("includes") String refers);
+                                                       @Query("pageSize") String pageSize,
+                                                       @Query("filters") String filters,
+                                                       @Query("includes") String refers);
 
     @GET("cc_shifts")
     Call<List<CCShifts>> ccShifts(@Query("pageNo") String pageNo,
                                   @Query("pageSize") String pageSize,
-                                  @Query("filters") String filters);
+                                  @Query("filters") String filters,
+                                  @Query("sortItem") String sortItem,
+                                  @Query("sortOrder") String sortOrder,
+                                  @Query("includes") String includes);
+
+    @GET("cc_shifts")
+    Call<List<CCShiftsInclude>> ccShiftsicl(@Query("pageNo") String pageNo,
+                                         @Query("pageSize") String pageSize,
+                                         @Query("filters") String filters,
+                                         @Query("sortItem") String sortItem,
+                                         @Query("sortOrder") String sortOrder,
+                                         @Query("includes") String includes);
+
     @GET("cc_shifts")
     Observable<List<CCShiftsUni>> ccShiftsUnique(@Query("pageNo") String pageNo,
-                                           @Query("pageSize") String pageSize,
-                                           @Query("filters") String filters,
-                                           @Query("includes") String includes);
+                                                 @Query("pageSize") String pageSize,
+                                                 @Query("filters") String filters,
+                                                 @Query("includes") String includes);
 
     @FormUrlEncoded
     @POST("cc_shifts/{cc_shift_id}/edit")
     Observable<CCShifts> ccShiftsEdit(@Header("X-Auth-Token") String header,
-                                            @Path("cc_shift_id") String id,
-                                            @Field("status") String status);
+                                      @Path("cc_shift_id") String id,
+                                      @Field("status") String status);
+
+    @GET("obtain_time")
+    Call<TimeBean> timeBean();
+
+
+    @GET("cc_duties")
+    Observable<List<CCDuties>> findPeopleByTime(@Query("filters")String filters);
+
+    // 交接班
+
+    // 待交班 状态为1 ， 点击交班后状态修改为0，详情中 如果状态为0 那么就提示 等待接班人接班。
+    // 接班人接班后 状态改为2，已交班完成 并且交班日期生成
+
+    @FormUrlEncoded
+    @POST("cc_shift_shifts/new")
+    Observable<ShiftBean> shiftNew(@Header("X-Auth-Token") String token,
+                                   @Field("ccDutyId") String dutyId,
+                                   @Field("handover") String handover,
+                                   @Field("successor") String successor,
+                                   @Field("remark") String type,
+                                   @Field("dutyDepartment") String dutyDepartment,
+                                   @Field("dutyDate") String dutyDate,
+                                   @Field("dutyShift") String duryShift);
+
+    // 待接班
+    @GET("cc_shift_shifts")
+    Observable<List<ShiftBean>> shiftList(@Query("pageNo") String pageNo,
+                                          @Query("pageSize") String pageSize,
+                                          @Query("filters") String filters,
+                                          @Query("sortItem") String sortItem,
+                                          @Query("sortOrder") String sortOrder);
+
+
+    // 修改状态
+    @FormUrlEncoded
+    @POST("cc_shift_shifts/{id}/edit")
+    Observable<ShiftBean> editShiftStatus(@Header("X-Auth-Token") String token,
+                                                @Path("id") String ccShiftID,
+                                                @Field("remark") String status);
+
+    // 修改值班内容。
+    @FormUrlEncoded
+    @POST("cc_shift_shifts/{id}/edit")
+    Observable<ShiftBean> editShiftRecord(@Header("X-Auth-Token") String token,
+                                                @Path("id") String ccShiftID,
+                                                @Field("dutyContent") String dutyContent);
 }

app/src/main/java/cn/bsl/bxbg/zhiban/net/client/AllPeopleClient.java

@@ -15,7 +15,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
 public class AllPeopleClient extends BaseClient {
 
     DutyAPI dutyAPI = new Retrofit.Builder()
-            .baseUrl(Constant.BASE_URL)
+            .baseUrl(Constant.HOST)
             .client(getClient())
             .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
             .addConverterFactory(GsonConverterFactory.create())
@@ -25,4 +25,9 @@ public class AllPeopleClient extends BaseClient {
     public Call<ResponseBody> stringCall() {
         return dutyAPI.people("searchDeptTree","11");
     }
+
+    public Call<ResponseBody> getAllUser() {
+        return dutyAPI.getAllpeople(Constant.USER_ID+"");
+    }
+
 }

app/src/main/java/cn/bsl/bxbg/zhiban/net/client/DutyPlanClient.java

@@ -2,15 +2,19 @@ package cn.bsl.bxbg.zhiban.net.client;
 
 import java.util.List;
 
+import cn.bsl.bxbg.zhiban.bean.ShiftBean;
+import cn.bsl.bxbg.zhiban.bean.TimeBean;
 import cn.bsl.bxbg.zhiban.net.api.DutyAPI;
 import cn.bsl.bxbg.zhiban.net.response.CCDuties;
 import cn.bsl.bxbg.zhiban.net.response.CCDutiesEdit;
 import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import cn.bsl.bxbg.zhiban.net.response.CCShiftsInclude;
 import cn.bsl.bxbg.zhiban.net.response.CCShiftsUni;
 import cn.bsl.bxbg.zhiban.net.response.DutiesTbResponse;
 import cn.bsl.bxbg.zhiban.net.response.DutyPlanResponse;
 import cn.bsl.bxbg.zhiban.net.response.TiaobanBean;
 import cn.bsl.bxbg.zhiban.utils.Constant;
+import cn.bsl.bxbg.zhiban.utils.DateUtils;
 import io.reactivex.Observable;
 import retrofit2.Call;
 import retrofit2.Retrofit;
@@ -35,7 +39,7 @@ public class DutyPlanClient extends BaseClient {
     }
 
     public Observable<List<CCDuties>> dutiesRecord() {
-        return dutyAPI.dutiesRecord("1", "100","duty_date");
+        return dutyAPI.dutiesRecord("1", "100","duty_date","{'cc_duty':{'duty_date':{like:'%"+ DateUtils.getMonth()+"%'}}}");
     }
 
     public Observable<CCDuties> dutiesById(String id) {
@@ -44,21 +48,25 @@ public class DutyPlanClient extends BaseClient {
 
 
     // 调班申请默认为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,
-                Constant.USER_NAME,transferredName,id,reason,dutyTime,"0",shift_timeStatus);
+    public Observable<TiaobanBean> tiaobanBean(String transferredClass,String transferredName,String id,String reason,String dutyTime,String shift_timeStatus,String departMent) {
+        return dutyAPI.tbRecord(Constant.USER_ID+"",Constant.USER_ID+"",Constant.USER_NAME,
+                transferredName,transferredClass,id,reason,dutyTime,"0",shift_timeStatus,departMent);
     }
 
     public Observable<CCDutiesEdit> editMorning(String cc_id,String morning) {
-        return dutyAPI.editMorning(Constant.USER_ID, cc_id, morning);
+        return dutyAPI.editMorning(Constant.USER_ID+"", cc_id, morning);
     }
 
     public Observable<CCDutiesEdit> editNoon(String cc_id,String noon) {
-        return dutyAPI.editNoon(Constant.USER_ID, cc_id, noon);
+        return dutyAPI.editNoon(Constant.USER_ID+"", cc_id, noon);
     }
 
     public Observable<CCDutiesEdit> editNight(String cc_id,String night) {
-        return dutyAPI.editNight(Constant.USER_ID, cc_id, night);
+        return dutyAPI.editNight(Constant.USER_ID+"", cc_id, night);
+    }
+
+    public Observable<CCDutiesEdit> editLeader(String cc_id,String leader) {
+        return dutyAPI.editLeader(Constant.USER_ID+"", cc_id, leader);
     }
 
     public Observable<List<DutiesTbResponse>> dutiesTb() {
@@ -70,8 +78,32 @@ public class DutyPlanClient extends BaseClient {
     }
 
     public Call<List<CCShifts>> shiftsRecord() {
-        return dutyAPI.ccShifts("1","1000","{'cc_shift':{'applicantTransferredNameequalTo':{'fieldsValuesOr':{'fields':['transferred_class','transferred_name'],'values':['"+Constant.USER_NAME+"']}}}}");
+        return dutyAPI.ccShifts("1","1000","{'cc_shift':{'applicantTransferredNameequalTo':{'fieldsValuesOr':{'fields':['transferred_class','transferred_name'],'values':['"+Constant.USER_NAME+"']}}}}","last_update_time","desc",
+                "{'cc_duty':{'includes':['applicant_duty_id']}}");
+    }
+
+    public Call<List<CCShifts>> shiftRecordFinish() {
+        return dutyAPI.ccShifts("1","1000","{'cc_shift': {'applicant': {'equalTo': '"+Constant.USER_NAME+"'},'status': {'notEqualTo': '0'}}}","last_update_time","desc","{'cc_duty':{'includes':['applicant_duty_id']}}");
+    }
+
+    public Call<List<CCShiftsInclude>> shiftFinish() {
+        return dutyAPI.ccShiftsicl("1","1000","{'cc_shift': {'applicant': {'equalTo': '"+Constant.USER_NAME+"'},'status': {'notEqualTo': '0'}}}","last_update_time","desc","{'cc_duty':{'includes':['applicant_duty_id']}}");
+    }
+
+    public Call<List<CCShifts>> shiftRecordNotFinish() {
+        return dutyAPI.ccShifts("1","1000","{'cc_shift': {'applicant': {'equalTo': '"+Constant.USER_NAME+"'},'status': {'equalTo': '0'}}}","last_update_time","desc","{'cc_duty':{'includes':['applicant_duty_id']}}");
+    }
+
+    public Call<List<CCShiftsInclude>> shiftInclNotFinish() {
+        return dutyAPI.ccShiftsicl("1","1000","{'cc_shift': {'applicant': {'equalTo': '"+Constant.USER_NAME+"'},'status': {'equalTo': '0'}}}","last_update_time","desc","{'cc_duty':{'includes':['applicant_duty_id']}}");
+    }
+
+    public Call<List<CCShiftsInclude>> shiftWaitMe(String status) {
+        return dutyAPI.ccShiftsicl("1","1000","{'cc_shift': {'transferred_name': {'equalTo': '"+Constant.USER_NAME+"'},'status': {'equalTo': '"+status+"'}}}","last_update_time","desc","{'cc_duty':{'includes':['applicant_duty_id']}}");
+    }
 
+    public Call<List<CCShifts>> shiftWaitMe() {
+        return dutyAPI.ccShifts("1","1000","{'cc_shift': {'transferred_name': {'equalTo': '"+Constant.USER_NAME+"'},'status': {'notEqualTo': 'status'}}}","last_update_time","desc","{'cc_duty':{'includes':['applicant_duty_id']}}");
     }
 
     public Observable<List<CCShiftsUni>> ccshiftUni(String id) {
@@ -80,7 +112,37 @@ public class DutyPlanClient extends BaseClient {
     }
 
     public Observable<CCShifts> ccShiftsEdit(String id, String status) {
-        return dutyAPI.ccShiftsEdit(Constant.USER_ID, id, status);
+        return dutyAPI.ccShiftsEdit(Constant.USER_ID+"", id, status);
+    }
+
+    public Call<TimeBean> timeBean() {
+        return dutyAPI.timeBean();
+    }
+
+    // 以下为交接班操作
+    public Observable<ShiftBean> shiftNew(String ccId,String successor,String dutyDepartment,
+                                   String dutyDate,String dutyShift) {
+        return dutyAPI.shiftNew(Constant.USER_ID + "", ccId,
+                Constant.USER_NAME, successor, "1", dutyDepartment, dutyDate, dutyShift);
+    }
+
+    public Observable<List<CCDuties>> findPeopleByTime(String date) {
+        return dutyAPI.findPeopleByTime("{'cc_duty':{'duty_date':{'equalTo':'"+date+"'}}}");
+    }
+
+    // column 代表的是要查哪个字段
+    public Observable<List<ShiftBean>> shiftList(String date,String name,String column) {
+        return dutyAPI.shiftList("1","1000","{'cc_shift_shift':{'duty_date':{'like':'%"+date+"%'},'"+column+"':{'equalTo':'"+name+"'}}}","create_time","desc");
+    }
+
+
+    public Observable<ShiftBean> editShiftRecord(String id,String content) {
+        return dutyAPI.editShiftRecord(Constant.USER_ID + "", id, content);
+    }
+
+
+    public Observable<ShiftBean> editShiftStatus(String id,String status) {
+        return dutyAPI.editShiftStatus(Constant.USER_ID+"",id,status);
     }
 
 }

app/src/main/java/cn/bsl/bxbg/zhiban/net/response/CCShifts.java

@@ -42,6 +42,8 @@ public class CCShifts {
     private Object leaderId;
     private Object applicantPosition;
 
+
+
     public String getId() {
         return id;
     }

app/src/main/java/cn/bsl/bxbg/zhiban/utils/Constant.java

@@ -4,11 +4,12 @@ package cn.bsl.bxbg.zhiban.utils;
  * Created by Xinghx on 2018/3/14 0014.
  */
 
-public interface Constant {
-    String HOST = "http://zjk.haomo-studio.com/zhangjiakouOA/";
-    String USER_ID = "11";
-    String USER_NAME = "科员";
-    String BASE_URL="http://haomo-tech.com:8077/hbOA/";
-    // 获取全部人员
-     String URL_GET_ALL_PEOPLE1 = BASE_URL + "roleManagerController.do?method=searchDeptTree";
+public class Constant {
+//    public static String HOST = "http://zjk.haomo-tech.com/zhangjiakouOA/";
+    public static String HOST = "http://143.19.128.79/api/";
+    public static int USER_ID = 0;
+    public static String USER_NAME = "";
+    public static String BASE_URL="http://haomo-tech.com:8077/hbOA/";
+    public static String systemDate = "";
+    public static long systemTime = 0L;
 }

app/src/main/java/cn/bsl/bxbg/zhiban/utils/DateUtils.java

+package cn.bsl.bxbg.zhiban.utils;
+
+import android.util.Log;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * Created by Xinghx on 2018/5/19 0019.
+ */
+
+public class DateUtils {
+    public static Calendar getInputCalendar(String date) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar calendar = Calendar.getInstance();
+        try {
+            Date parse = sdf.parse(date);
+            calendar.setTime(parse);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return calendar;
+    }
+
+    public static String getMonth() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        Calendar calendar = Calendar.getInstance();
+        String getYearAndMonth = sdf.format(calendar.getTime());
+        Log.d("datedate", "getMonth: " + calendar.getTime());
+
+        return getYearAndMonth;
+
+    }
+
+    public static Calendar getTomorrowDate(String date) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        try {
+            Date parse = sdf.parse(date);
+            calendar.setTime(parse);
+            calendar.add(calendar.DATE, 1);
+            Log.d("datedate", "getTomorrowDate: " + calendar.getTime());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        } finally {
+            return calendar;
+        }
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/utils/DialogUtil.java

+package cn.bsl.bxbg.zhiban.utils;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import cn.bsl.bxbg.zhiban.R;
+
+
+public class DialogUtil
+{
+	private static DialogUtil instance;
+
+	private DialogUtil()
+	{
+	}
+
+	
+	public static DialogUtil getInstance()
+	{
+		if (instance == null)
+		{
+			instance = new DialogUtil();
+		}
+		return instance;
+	}
+
+	
+	public LoadDialog showLoadDialog(Context context, String text)
+	{
+		LoadDialog dialog = new LoadDialog(context, R.style.popup_dialog_style);
+		Window window = dialog.getWindow();
+		window.setGravity(Gravity.TOP);
+		
+		WindowManager mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+		WindowManager.LayoutParams lp = window.getAttributes();
+		lp.y = 60;// 设置y坐标
+		window.setAttributes(lp);
+		window.setWindowManager(mWindowManager, null, null);
+		dialog.setCanceledOnTouchOutside(false);// 设置点击Dialog外部任意区域不可关闭Dialog
+		dialog.show();
+		if (text != null && !text.equals(""))
+		{
+			dialog.setLoadText(text);
+		}
+		return dialog;
+	}
+
+	
+	public LoadDialog showLoadDialog(Context context)
+	{
+		LoadDialog dialog = new LoadDialog(context, R.style.popup_dialog_style);
+		Window window = dialog.getWindow();
+		window.setGravity(Gravity.TOP);
+		
+		WindowManager mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+		WindowManager.LayoutParams lp = window.getAttributes();
+		lp.y = 60;// 设置y坐标
+		window.setAttributes(lp);
+		window.setWindowManager(mWindowManager, null, null);
+		dialog.setCanceledOnTouchOutside(false);// 设置点击Dialog外部任意区域不可关闭Dialog
+		dialog.show();
+		return dialog;
+	}
+
+	
+	public void dialogDismiss(Dialog dialog)
+	{
+		if (dialog != null && dialog.isShowing())
+		{
+			dialog.dismiss();
+		}
+	}
+
+}

app/src/main/java/cn/bsl/bxbg/zhiban/utils/LoadDialog.java

+package cn.bsl.bxbg.zhiban.utils;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import cn.bsl.bxbg.zhiban.R;
+
+
+public class LoadDialog extends Dialog
+{
+	Context mContext;
+	private TextView loadTv;
+
+	public LoadDialog(Context context)
+	{
+		super(context);
+		this.mContext = context;
+	}
+
+	public LoadDialog(Context context, int theme)
+	{
+		super(context, theme);
+		this.mContext = context;
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.widget_load_dialog);
+		// 使dialog全局
+		getWindow().setLayout(android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.MATCH_PARENT);
+		initViews();
+	}
+
+	// 控件初始化
+	private void initViews()
+	{
+		loadTv = (TextView) findViewById(R.id.widget_dialog_loading_tv);
+	}
+
+	
+	public void setLoadText(String text)
+	{
+		loadTv.setText(text);
+	}
+
+}

app/src/main/java/cn/bsl/bxbg/zhiban/view/DutyTransferActivity.java

+package cn.bsl.bxbg.zhiban.view;
+
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cn.bsl.bxbg.zhiban.BaseActivity;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.fragment.AlreadyTakeOverFragment;
+import cn.bsl.bxbg.zhiban.fragment.WaitShiftFragment;
+import cn.bsl.bxbg.zhiban.fragment.WaitTakeOverFragment;
+
+public class DutyTransferActivity extends BaseActivity {
+
+    @BindView(R.id.jj_layout)
+    TabLayout jjLayout;
+    @BindView(R.id.jj_viewpager)
+    ViewPager jjViewpager;
+    private ArrayList<Fragment> waitMeFinishFragments = new ArrayList<>();
+    private ViewPagerAdapter viewPagerAdapter;
+    private String[] mTitles = new String[]{"待交班", "待接班","已交班"};
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_duty_transfer);
+        ButterKnife.bind(this);
+        initView();
+    }
+
+    private void initView() {
+        viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
+        waitMeFinishFragments.add(new WaitShiftFragment());
+        waitMeFinishFragments.add(new WaitTakeOverFragment());
+        waitMeFinishFragments.add(new AlreadyTakeOverFragment());
+        jjViewpager.setAdapter(viewPagerAdapter);
+        jjLayout.setupWithViewPager(jjViewpager);
+    }
+
+    public class ViewPagerAdapter extends FragmentStatePagerAdapter {
+
+        public ViewPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return waitMeFinishFragments.get(position);
+        }
+
+        @Override
+        public int getCount() {
+            return waitMeFinishFragments.size();
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return mTitles[position];
+        }
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/view/MainActivity.java

 package cn.bsl.bxbg.zhiban.view;
 
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.os.Bundle;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.GridView;
 
+import com.bril.baoding.studio.aidl.GetUserid;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -15,18 +23,43 @@ import cn.bsl.bxbg.zhiban.BaseActivity;
 import cn.bsl.bxbg.zhiban.R;
 import cn.bsl.bxbg.zhiban.adapter.HomeAdapter;
 import cn.bsl.bxbg.zhiban.bean.MenuBean;
+import cn.bsl.bxbg.zhiban.bean.TimeBean;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.utils.Constant;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
-public class MainActivity extends BaseActivity implements AdapterView.OnItemClickListener{
+public class MainActivity extends BaseActivity implements AdapterView.OnItemClickListener {
 
     @BindView(R.id.home_gv)
     GridView homeGv;
+    private GetUserid mService;
+    private static final String TAG = "MainActivity";
+    private DutyPlanClient dutyPlanClient;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
+        bindService();
         initTab();
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initData();
+    }
+
+    private void bindService() {
+
+        Intent intent = new Intent();
+        intent.setComponent(
+                new ComponentName("com.bril.baoding.studio", "com.bril.baoding.studio.service.AIDLService"));
+        bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
     }
 
     private void initTab() {
@@ -34,17 +67,58 @@ public class MainActivity extends BaseActivity implements AdapterView.OnItemClic
         homeGv.setOnItemClickListener(this);
     }
 
+    private void initData() {
+        dutyPlanClient = new DutyPlanClient();
+        dutyPlanClient.timeBean().enqueue(new Callback<TimeBean>() {
+            @Override
+            public void onResponse(Call<TimeBean> call, Response<TimeBean> response) {
+                Constant.systemDate = response.body().getSystemDate();
+                Constant.systemTime = response.body().getSystemTime();
+            }
+
+            @Override
+            public void onFailure(Call<TimeBean> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
+    }
+
     private List<MenuBean> menuData() {
         List<MenuBean> menuList = new ArrayList<>();
-        MenuBean fbjl = new MenuBean(R.drawable.zb_info,"值班信息");
-        MenuBean fbj2 = new MenuBean(R.drawable.zb_table,"值班表");
-        MenuBean fbj3 = new MenuBean(R.drawable.tb_record,"调班记录");
+        MenuBean fbjl = new MenuBean(R.drawable.zb_info, "值班信息");
+        MenuBean fbj2 = new MenuBean(R.drawable.zb_table, "值班表");
+        MenuBean fbj3 = new MenuBean(R.drawable.tb_record, "调班记录");
+        MenuBean fbj4 = new MenuBean(R.drawable.waitme, "待办事项");
+        MenuBean fbj5 = new MenuBean(R.drawable.jiaoban_record,"交接班记录");
         menuList.add(fbjl);
         menuList.add(fbj2);
         menuList.add(fbj3);
+        menuList.add(fbj4);
+        menuList.add(fbj5);
         return menuList;
     }
 
+    private ServiceConnection mServiceConnection = new ServiceConnection() {
+
+        @Override
+        public void onServiceDisconnected(ComponentName arg0) {
+            mService = null;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName arg0, IBinder arg1) {
+            mService = GetUserid.Stub.asInterface(arg1);
+            try {
+                Constant.USER_ID = mService.getUserid();
+                Constant.USER_NAME = mService.getUsername();
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+
+            Log.d(TAG, "onServiceConnected: " + Constant.USER_NAME);
+        }
+    };
+
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Intent intent = new Intent();
@@ -56,7 +130,13 @@ public class MainActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.setClass(MainActivity.this, ZhibanTableActivity.class);
                 break;
             case 2:
-                intent.setClass(MainActivity.this,TiaobanRecordActivity.class);
+                intent.setClass(MainActivity.this, TiaobanRecordActivity.class);
+                break;
+            case 3:
+                intent.setClass(MainActivity.this, WaitMeActivity.class);
+                break;
+            case 4:
+                intent.setClass(MainActivity.this, DutyTransferActivity.class);
                 break;
         }
         startActivity(intent);

app/src/main/java/cn/bsl/bxbg/zhiban/view/TakeOverDetailsActivity.java

+package cn.bsl.bxbg.zhiban.view;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import cn.bsl.bxbg.zhiban.BaseActivity;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Created by Xinghx on 2018/5/20 0020.
+ */
+
+public class TakeOverDetailsActivity extends BaseActivity {
+    @BindView(R.id.shift_zb_time)
+    TextView shiftZbTime;
+    @BindView(R.id.shift_zb_shift)
+    TextView shiftZbShift;
+    @BindView(R.id.shift_zb_person)
+    TextView shiftZbPerson;
+    @BindView(R.id.shift_zb_content)
+    EditText shiftZbContent;
+    @BindView(R.id.btn_ok)
+    Button btnOk;
+    @BindView(R.id.save)
+    TextView save;
+
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    private String trsid;
+    private String dutyContent;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.shift_details_layout);
+        ButterKnife.bind(this);
+
+        initView();
+    }
+
+    private void initData() {
+
+    }
+
+    private void initView() {
+        trsid = getIntent().getStringExtra("id");
+        String status = getIntent().getStringExtra("status");
+        String dutyTime = getIntent().getStringExtra("dutyTime");
+        String dutyShift = getIntent().getStringExtra("dutyShift");
+        dutyContent = getIntent().getStringExtra("dutyContent");
+        shiftZbTime.setText(dutyTime);
+        switch (dutyShift) {
+            case "0":
+                shiftZbShift.setText("早");
+                break;
+            case "1":
+                shiftZbShift.setText("中");
+                break;
+            case "2":
+                shiftZbShift.setText("晚");
+                break;
+        }
+
+        shiftZbContent.setText(dutyContent + "");
+
+        switch (status) {
+            case "0":
+                btnOk.setText("确认接班");
+                shiftZbContent.setEnabled(false);
+                shiftZbContent.setFocusable(false);
+                shiftZbContent.setKeyListener(null);
+                shiftZbContent.setHint("");
+                break;
+            case "1":
+                save.setVisibility(View.VISIBLE);
+                btnOk.setText("交班");
+                break;
+            case "2":
+                btnOk.setVisibility(View.GONE);
+                shiftZbContent.setEnabled(false);
+                shiftZbContent.setFocusable(false);
+                shiftZbContent.setKeyListener(null);
+                shiftZbContent.setHint("");
+                break;
+        }
+    }
+
+
+    @OnClick({R.id.save, R.id.btn_ok})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.save:
+                // 编辑值班记录
+                dutyPlanClient.editShiftRecord(trsid,shiftZbContent.getText().toString())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribeOn(Schedulers.io())
+                        .subscribe(shiftBeen -> {
+                            Toast.makeText(this, "修改成功", Toast.LENGTH_SHORT).show();
+                            finish();
+                        },Throwable::printStackTrace);
+                break;
+            case R.id.btn_ok:
+                if (btnOk.getText().equals("确认接班")) {
+                    dutyPlanClient.editShiftStatus(trsid,"2")
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(shiftBean -> {
+                                Toast.makeText(this, "接班成功", Toast.LENGTH_SHORT).show();
+                                finish();
+                            },Throwable::printStackTrace);
+                } else if (btnOk.getText().equals("交班")) {
+                    dutyPlanClient.editShiftStatus(trsid, "0")
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(shiftBean -> {
+                                Toast.makeText(this, "等待交班", Toast.LENGTH_SHORT).show();
+                                finish();
+                            },Throwable::printStackTrace);
+                }
+                break;
+        }
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaobanDetailsActivity.java

@@ -50,6 +50,8 @@ public class TiaobanDetailsActivity extends BaseActivity {
     RadioGroup rg;
     @BindView(R.id.tv_status)
     TextView tvStatus;
+    @BindView(R.id.duty_dept)
+    TextView dutyDept;
     private String id;
     DutyPlanClient dutyPlanClient = new DutyPlanClient();
     String status = "1";
@@ -74,14 +76,16 @@ public class TiaobanDetailsActivity extends BaseActivity {
                     public void accept(List<DutiesTbResponse> dutiesTbResponses) throws Exception {
                         cc_duty_id = dutiesTbResponses.get(0).getIncludes().getCc_duty().getId();
                         String createTime = dutiesTbResponses.get(0).getSuperior().getCreateTime();
+                        String dutyDepts = dutiesTbResponses.get(0).getIncludes().getCc_duty().getDepartment();
                         String dutyDate = dutiesTbResponses.get(0).getIncludes().getCc_duty().getDutyDate();
                         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).getSuperior().getTransferredName() + " 变更为 " + dutiesTbResponses.get(0).getSuperior().getTransferredClass();
+                        String change = dutiesTbResponses.get(0).getSuperior().getApplicant() + " 变更为 " + dutiesTbResponses.get(0).getSuperior().getTransferredName();
+                        dutyDept.setText(dutyDepts);
                         dutyTimes.setText(dutyDate);
                         person.setText(people);
                         changePerson.setText(change);
-                        // simple if 换班人是我判断id 如果被换班是我 直接修改
-                        if (dutiesTbResponses.get(0).getSuperior().getTransferredName().equals(Constant.USER_NAME)) {
+                        // simple if 换班人是我判断id 如果被换班是我
+                        if (dutiesTbResponses.get(0).getSuperior().getApplicant().equals(Constant.USER_NAME)) {
 
                             if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("0")) {
                                 tvStatus.setText("调班状态：等待对方操作");
@@ -98,7 +102,7 @@ public class TiaobanDetailsActivity extends BaseActivity {
                                 rg.setVisibility(View.GONE);
                                 submit.setVisibility(View.GONE);
                             }
-                        } else if (dutiesTbResponses.get(0).getSuperior().getTransferredClass().equals(Constant.USER_NAME)) {
+                        } else if (dutiesTbResponses.get(0).getSuperior().getTransferredName().equals(Constant.USER_NAME)) {
                             // 被换班人是我
                             if (dutiesTbResponses.get(0).getSuperior().getStatus().equals("0")) {
                                 tvStatus.setVisibility(View.GONE);
@@ -144,7 +148,7 @@ public class TiaobanDetailsActivity extends BaseActivity {
     public void onViewClicked() {
 
         if (status.equals("1")) {
-            dutyPlanClient.ccShiftsEdit(id,status).flatMap(new Function<CCShifts, ObservableSource<List<CCShiftsUni>>>() {
+            dutyPlanClient.ccShiftsEdit(id, status).flatMap(new Function<CCShifts, ObservableSource<List<CCShiftsUni>>>() {
                 @Override
                 public ObservableSource<List<CCShiftsUni>> apply(CCShifts ccShifts) throws Exception {
                     return dutyPlanClient.ccshiftUni(id);
@@ -158,19 +162,21 @@ public class TiaobanDetailsActivity extends BaseActivity {
                     } else if (ccShiftsUnis.get(0).getSuperior().getTransferredClassTime().equals("1")) {
                         String noon = ccShiftsUnis.get(0).getIncludes().getCc_duty().getNoon();
                         return dutyPlanClient.editNoon(cc_duty_id, noon.replace(ccShiftsUnis.get(0).getSuperior().getTransferredName(), ccShiftsUnis.get(0).getSuperior().getTransferredClass()));
-                    } else {
+                    } else if (ccShiftsUnis.get(0).getSuperior().getTransferredClassTime().equals("2")) {
                         String eve = ccShiftsUnis.get(0).getIncludes().getCc_duty().getEvening();
                         return dutyPlanClient.editNight(cc_duty_id, eve.replace(ccShiftsUnis.get(0).getSuperior().getTransferredName(), ccShiftsUnis.get(0).getSuperior().getTransferredClass()));
+                    } else {
+                        return dutyPlanClient.editLeader(cc_duty_id, ccShiftsUnis.get(0).getSuperior().getTransferredClass());
                     }
                 }
             }).subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(ccDutiesEdit -> {
-                Toast.makeText(TiaobanDetailsActivity.this, "操作成功", Toast.LENGTH_SHORT).show();
-                finish();
-            },Throwable::printStackTrace);
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(ccDutiesEdit -> {
+                        Toast.makeText(TiaobanDetailsActivity.this, "操作成功", Toast.LENGTH_SHORT).show();
+                        finish();
+                    }, Throwable::printStackTrace);
         } else {
-            dutyPlanClient.ccShiftsEdit(id,status).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(ccShifts -> {
+            dutyPlanClient.ccShiftsEdit(id, status).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(ccShifts -> {
                 Toast.makeText(TiaobanDetailsActivity.this, "操作成功", Toast.LENGTH_SHORT).show();
                 finish();
             }, Throwable::printStackTrace);

app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaobanRecordActivity.java

 package cn.bsl.bxbg.zhiban.view;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
 
-import java.util.List;
+import java.util.ArrayList;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cn.bsl.bxbg.zhiban.BaseActivity;
 import cn.bsl.bxbg.zhiban.R;
-import cn.bsl.bxbg.zhiban.adapter.TiaobanInfoAdapter;
-import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
-import cn.bsl.bxbg.zhiban.net.response.CCShifts;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
+import cn.bsl.bxbg.zhiban.fragment.TiaoBanFinishFragment;
+import cn.bsl.bxbg.zhiban.fragment.TiaoBanNotFinishFragment;
 
 public class TiaobanRecordActivity extends BaseActivity {
 
-    @BindView(R.id.tbLv)
-    ListView tbLv;
-
-    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    private ArrayList<Fragment> waitMeFinishFragments = new ArrayList<>();
+    private ViewPagerAdapter viewPagerAdapter;
+    @BindView(R.id.tb_layout)
+    TabLayout tbLayout;
+    @BindView(R.id.tb_viewpager)
+    ViewPager tbViewpager;
 
+    private String[] mTitles = new String[]{"已完成", "未完成"};
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_tiaoban_record);
         ButterKnife.bind(this);
-        queryRecord();
-
+        initView();
     }
 
-    private void queryRecord() {
-        dutyPlanClient.shiftsRecord().enqueue(new Callback<List<CCShifts>>() {
-            @Override
-            public void onResponse(Call<List<CCShifts>> call, Response<List<CCShifts>> response) {
-                List<CCShifts> ccShift = response.body();
-                tbLv.setAdapter(new TiaobanInfoAdapter(ccShift));
-                tbLv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                        Intent intent = new Intent(TiaobanRecordActivity.this,TiaobanDetailsActivity.class);
-                        intent.putExtra("id", ccShift.get(position).getId());
-                        startActivity(intent);
-                    }
-                });
-            }
-
-            @Override
-            public void onFailure(Call<List<CCShifts>> call, Throwable t) {
-                t.printStackTrace();
-            }
-        });
+    private void initView() {
+        viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
+        waitMeFinishFragments.add(new TiaoBanFinishFragment());
+        waitMeFinishFragments.add(new TiaoBanNotFinishFragment());
+        tbViewpager.setAdapter(viewPagerAdapter);
+        tbLayout.setupWithViewPager(tbViewpager);
     }
 
+
+
+
+    public class ViewPagerAdapter extends FragmentStatePagerAdapter {
+
+        public ViewPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return waitMeFinishFragments.get(position);
+        }
+
+        @Override
+        public int getCount() {
+            return waitMeFinishFragments.size();
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return mTitles[position];
+        }
+    }
 }

app/src/main/java/cn/bsl/bxbg/zhiban/view/TiaobanRecordActivity2.java

+package cn.bsl.bxbg.zhiban.view;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cn.bsl.bxbg.zhiban.BaseActivity;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.adapter.TiaobanInfoAdapter;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+public class TiaobanRecordActivity2 extends BaseActivity {
+
+    @BindView(R.id.tbLv)
+    ListView tbLv;
+
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_tiaoban_record);
+        ButterKnife.bind(this);
+        queryRecord();
+
+    }
+
+    private void queryRecord() {
+        dutyPlanClient.shiftsRecord().enqueue(new Callback<List<CCShifts>>() {
+            @Override
+            public void onResponse(Call<List<CCShifts>> call, Response<List<CCShifts>> response) {
+                List<CCShifts> ccShift = response.body();
+                tbLv.setAdapter(new TiaobanInfoAdapter(ccShift));
+                tbLv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                        Intent intent = new Intent(TiaobanRecordActivity2.this,TiaobanDetailsActivity.class);
+                        intent.putExtra("id", ccShift.get(position).getId());
+                        startActivity(intent);
+                    }
+                });
+            }
+
+            @Override
+            public void onFailure(Call<List<CCShifts>> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
+    }
+
+}

app/src/main/java/cn/bsl/bxbg/zhiban/view/WaitMeActivity.java

+package cn.bsl.bxbg.zhiban.view;
+
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cn.bsl.bxbg.zhiban.BaseActivity;
+import cn.bsl.bxbg.zhiban.R;
+import cn.bsl.bxbg.zhiban.fragment.WaitMeFinishFragment;
+import cn.bsl.bxbg.zhiban.fragment.WaitMeNotFinishFragment;
+import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
+import cn.bsl.bxbg.zhiban.net.response.CCShifts;
+
+public class WaitMeActivity extends BaseActivity {
+
+    List<CCShifts> ccShiftsList;
+    private ViewPagerAdapter viewPagerAdapter;
+    @BindView(R.id.tb_layout)
+    TabLayout tbLayout;
+    @BindView(R.id.tb_viewpager)
+    ViewPager tbViewpager;
+    private String[] mTitles = new String[]{"已完成", "未完成"};
+    private DutyPlanClient dutyPlanClient = new DutyPlanClient();
+    private ArrayList<Fragment> waitMeFinishFragments = new ArrayList<>();
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_wait_me);
+        ButterKnife.bind(this);
+        viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
+        waitMeFinishFragments.add(new WaitMeFinishFragment());
+        waitMeFinishFragments.add(new WaitMeNotFinishFragment());
+        tbViewpager.setAdapter(viewPagerAdapter);
+        tbLayout.setupWithViewPager(tbViewpager);
+//        initData();
+    }
+
+
+    public class ViewPagerAdapter extends FragmentStatePagerAdapter {
+
+        public ViewPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return waitMeFinishFragments.get(position);
+        }
+
+        @Override
+        public int getCount() {
+            return waitMeFinishFragments.size();
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return mTitles[position];
+        }
+    }
+}

app/src/main/java/cn/bsl/bxbg/zhiban/view/ZhibanDetailsActivity.java

@@ -2,10 +2,15 @@ package cn.bsl.bxbg.zhiban.view;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 
 import butterknife.BindView;
@@ -14,20 +19,42 @@ import butterknife.OnClick;
 import cn.bsl.bxbg.zhiban.BaseActivity;
 import cn.bsl.bxbg.zhiban.R;
 import cn.bsl.bxbg.zhiban.adapter.ZbPeopleAdapter;
+import cn.bsl.bxbg.zhiban.bean.TimeBean;
 import cn.bsl.bxbg.zhiban.net.client.DutyPlanClient;
 import cn.bsl.bxbg.zhiban.net.response.CCDuties;
+import cn.bsl.bxbg.zhiban.utils.Constant;
+import cn.bsl.bxbg.zhiban.utils.DateUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 public class ZhibanDetailsActivity extends BaseActivity {
 
-    private List<CCDuties> ccDuties = new ArrayList<>();
+    @BindView(R.id.tvTiaoban)
+    TextView tvTiaoban;
+    @BindView(R.id.start_zb)
+    LinearLayout startZb;
+    @BindView(R.id.duty_dept)
+    TextView dutyDept;
+    @BindView(R.id.tb)
+    LinearLayout tb;
+    @BindView(R.id.tvZhiban)
+    TextView tvZhiban;
+    @BindView(R.id.tbs)
+    LinearLayout tbs;
+    private List<CCDuties> ccDutiesList = new ArrayList<>();
     @BindView(R.id.duty_time)
     TextView dutyTime;
     @BindView(R.id.zb_people)
     ListView zbPeople;
     DutyPlanClient dutyPlanClient = new DutyPlanClient();
     private String dutyId;
+    private String shift;
+    private String dutyTimes;
+    private String tomorrowMorning;
+    private CCDuties netClcDuties;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,10 +62,56 @@ public class ZhibanDetailsActivity extends BaseActivity {
         setContentView(R.layout.activity_zhiban_details);
         ButterKnife.bind(this);
         initData();
+        initTime();
+        nextTime();
+    }
+
+    private void nextTime() {
+        Calendar tomorrowDate = DateUtils.getTomorrowDate(dutyTimes);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String date = sdf.format(tomorrowDate.getTime());
+        dutyPlanClient.findPeopleByTime(date)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(ccDuties -> {
+                    if (ccDuties != null && ccDuties.size() > 0) {
+                        tomorrowMorning = ccDuties.get(0).getMorning();
+                    }
+                }, Throwable::printStackTrace);
+    }
+
+    private void initTime() {
+        dutyPlanClient.timeBean().enqueue(new Callback<TimeBean>() {
+            @Override
+            public void onResponse(Call<TimeBean> call, Response<TimeBean> response) {
+                Constant.systemDate = response.body().getSystemDate();
+                Constant.systemTime = response.body().getSystemTime();
+            }
+
+            @Override
+            public void onFailure(Call<TimeBean> call, Throwable t) {
+                t.printStackTrace();
+            }
+        });
     }
 
     private void initData() {
+        // 拿ZhibanInfo传入的早中晚数据进行调班，但是展示需要使用dutyId查询出当天所有的记录.
         dutyId = getIntent().getStringExtra("dutyId");
+        String classLeader = getIntent().getStringExtra("dutyLeader") + "";
+        String morning = getIntent().getStringExtra("dutyPersonMorning") + "";
+        String noon = getIntent().getStringExtra("dutyPersonNoon") + "";
+        String evening = getIntent().getStringExtra("dutyPersonEvening") + "";
+        dutyTimes = getIntent().getStringExtra("dutyTime") + "";
+        shift = getIntent().getStringExtra("shift") + "";
+        CCDuties ccDuties = new CCDuties();
+        ccDuties.setId(dutyId);
+        ccDuties.setClassLeaders(classLeader);
+        ccDuties.setMorning(morning);
+        ccDuties.setNoon(noon);
+        ccDuties.setEvening(evening);
+        ccDuties.setDutyDate(dutyTimes);
+        ccDutiesList.add(ccDuties);
         queryDetails(dutyId);
     }
 
@@ -47,21 +120,58 @@ public class ZhibanDetailsActivity extends BaseActivity {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(clcDuties -> {
-                    ccDuties.clear();
+                    netClcDuties = clcDuties;
+//                    ccDutiesList.clear();
                     dutyTime.setText(clcDuties.getDutyDate());
+                    dutyDept.setText(clcDuties.getDepartment());
+//                    ccDutiesList.add(clcDuties);
+                    List<CCDuties> ccDuties = new ArrayList<CCDuties>();
                     ccDuties.add(clcDuties);
                     zbPeople.setAdapter(new ZbPeopleAdapter(ccDuties));
                 }, Throwable::printStackTrace);
     }
 
-    @OnClick(R.id.tb)
-    public void onViewClicked() {
-        Intent intent = new Intent(this,TiaoBanPublish.class);
-        intent.putExtra("id", dutyId);
-        intent.putExtra("morning", ccDuties.get(0).getMorning());
-        intent.putExtra("noon", ccDuties.get(0).getNoon());
-        intent.putExtra("evening", ccDuties.get(0).getEvening());
-        intent.putExtra("dutyTime", dutyTime.getText().toString());
-        startActivity(intent);
+
+    @OnClick({R.id.tb, R.id.start_zb})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tb:
+                Intent intent = new Intent(this, TiaoBanPublish.class);
+                intent.putExtra("id", dutyId);
+                intent.putExtra("morning", ccDutiesList.get(0).getMorning());
+                intent.putExtra("noon", ccDutiesList.get(0).getNoon());
+                intent.putExtra("evening", ccDutiesList.get(0).getEvening());
+                intent.putExtra("dutyTime", dutyTime.getText().toString());
+                intent.putExtra("leaderChange", ccDutiesList.get(0).getClassLeaders());
+                intent.putExtra("department", netClcDuties.getDepartment());
+                startActivity(intent);
+                break;
+            case R.id.start_zb:
+                // 如果班次为早班， 那么需要传入中班A岗的人员，如果是中班， 需要拿到晚班的A岗，如果是晚班
+                // ，需要拿第二天值班的早班
+                String nextPeople = "数据错误";
+                if (shift.equals("2")) {
+                    String[] split = tomorrowMorning.split(",");
+                    nextPeople = split[0];
+                } else if (shift.equals("0")) {
+                    // 早班拿中班
+                    String[] split = netClcDuties.getNoon().split(",");
+                    nextPeople = split[0];
+                } else if (shift.equals("1")) {
+                    // 中班拿晚班
+                    String[] split = netClcDuties.getEvening().split(",");
+                    nextPeople = split[0];
+
+                }
+                dutyPlanClient.shiftNew(dutyId, nextPeople, ccDutiesList.get(0).getDepartment(),
+                        ccDutiesList.get(0).getDutyDate(), shift)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(shiftBean -> {
+                            Toast.makeText(this, "开始值班，您可以在交接班记录编辑您的值班记录", Toast.LENGTH_SHORT).show();
+                            finish();
+                        }, Throwable::printStackTrace);
+                break;
+        }
     }
 }

app/src/main/java/cn/bsl/bxbg/zhiban/view/ZhibanInfoActivity.java

@@ -42,7 +42,86 @@ public class ZhibanInfoActivity extends BaseActivity implements AdapterView.OnIt
         setContentView(R.layout.activity_zhiban_info);
         ButterKnife.bind(this);
         initView();
-        queryRecord();
+//        queryRecord();
+        initData();
+    }
+
+    List<DutyPlanDutiesBean> dutyPlanDutiesBeen = new ArrayList<>();
+    private void initData() {
+
+        dutyPlanClient.dutiesRecord()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(ccDuties -> {
+                    dutyPlanDutiesBeen.clear();
+                    for (int i = 0; i < ccDuties.size(); i++) {
+                        // 现在逻辑为值班分早中晚三个班次，所以希望按早中晚展示出来。
+                        if (ccDuties.get(i).getClassLeaders().contains(Constant.USER_NAME)) {
+                            DutyPlanDutiesBean dutyPlanDutiesBean = new DutyPlanDutiesBean();
+                            dutyPlanDutiesBean.setDutyId(ccDuties.get(i).getId());
+                            dutyPlanDutiesBean.setLeader(ccDuties.get(i).getClassLeaders());
+                            dutyPlanDutiesBean.setMorning(ccDuties.get(i).getMorning());
+                            dutyPlanDutiesBean.setNoon(ccDuties.get(i).getNoon());
+                            dutyPlanDutiesBean.setEvening(ccDuties.get(i).getEvening());
+                            dutyPlanDutiesBean.setDutyDate(ccDuties.get(i).getDutyDate());
+                            dutyPlanDutiesBean.setType("4");
+                            dutyPlanDutiesBeen.add(dutyPlanDutiesBean);
+                        }
+                        if (ccDuties.get(i).getMorning().contains(Constant.USER_NAME)) {
+                            DutyPlanDutiesBean dutyPlanDutiesBean = new DutyPlanDutiesBean();
+                            dutyPlanDutiesBean.setDutyId(ccDuties.get(i).getId());
+                            dutyPlanDutiesBean.setLeader(ccDuties.get(i).getClassLeaders());
+                            dutyPlanDutiesBean.setMorning(ccDuties.get(i).getMorning());
+                            dutyPlanDutiesBean.setNoon(ccDuties.get(i).getNoon());
+                            dutyPlanDutiesBean.setEvening(ccDuties.get(i).getEvening());
+                            dutyPlanDutiesBean.setDutyDate(ccDuties.get(i).getDutyDate());
+                            dutyPlanDutiesBean.setType("0");
+                            dutyPlanDutiesBeen.add(dutyPlanDutiesBean);
+                        }
+                        if (ccDuties.get(i).getNoon().contains(Constant.USER_NAME)) {
+                            DutyPlanDutiesBean dutyPlanDutiesBean = new DutyPlanDutiesBean();
+                            dutyPlanDutiesBean.setDutyId(ccDuties.get(i).getId());
+                            dutyPlanDutiesBean.setLeader(ccDuties.get(i).getClassLeaders());
+                            dutyPlanDutiesBean.setMorning(ccDuties.get(i).getMorning());
+                            dutyPlanDutiesBean.setNoon(ccDuties.get(i).getNoon());
+                            dutyPlanDutiesBean.setEvening(ccDuties.get(i).getEvening());
+                            dutyPlanDutiesBean.setDutyDate(ccDuties.get(i).getDutyDate());
+                            dutyPlanDutiesBean.setType("1");
+                            dutyPlanDutiesBeen.add(dutyPlanDutiesBean);
+                        }
+
+                        if (ccDuties.get(i).getEvening().contains(Constant.USER_NAME)) {
+                            DutyPlanDutiesBean dutyPlanDutiesBean = new DutyPlanDutiesBean();
+                            dutyPlanDutiesBean.setDutyId(ccDuties.get(i).getId());
+                            dutyPlanDutiesBean.setLeader(ccDuties.get(i).getClassLeaders());
+                            dutyPlanDutiesBean.setMorning(ccDuties.get(i).getMorning());
+                            dutyPlanDutiesBean.setNoon(ccDuties.get(i).getNoon());
+                            dutyPlanDutiesBean.setEvening(ccDuties.get(i).getEvening());
+                            dutyPlanDutiesBean.setDutyDate(ccDuties.get(i).getDutyDate());
+                            dutyPlanDutiesBean.setType("2");
+                            dutyPlanDutiesBeen.add(dutyPlanDutiesBean);
+                        }
+//                        if (ccDuties.get(i).getMorning().contains(Constant.USER_NAME)
+//                                || ccDuties.get(i).getNoon().contains(Constant.USER_NAME)
+//                                || ccDuties.get(i).getEvening().contains(Constant.USER_NAME)
+//                                || ccDuties.get(i).getClassLeaders().contains(Constant.USER_NAME)) {
+//                            DutyPlanDutiesBean dutyPlanDutiesBean = new DutyPlanDutiesBean();
+//                            dutyPlanDutiesBean.setDutyId(ccDuties.get(i).getId());
+//                            dutyPlanDutiesBean.setLeader(ccDuties.get(i).getClassLeaders());
+//                            dutyPlanDutiesBean.setMorning(ccDuties.get(i).getMorning());
+//                            dutyPlanDutiesBean.setNoon(ccDuties.get(i).getNoon());
+//                            dutyPlanDutiesBean.setEvening(ccDuties.get(i).getEvening());
+//                            dutyPlanDutiesBean.setDutyDate(ccDuties.get(i).getDutyDate());
+//                            dutyPlanDutiesBeen.add(dutyPlanDutiesBean);
+//                            planDuties = dutyPlanDutiesBeen;
+//                            zhibanInfoAdapter=new ZhibanInfoAdapter(planDuties);
+//                            zbLv.setAdapter(zhibanInfoAdapter);
+//                        }
+                    }
+                    planDuties = dutyPlanDutiesBeen;
+                    zhibanInfoAdapter=new ZhibanInfoAdapter(planDuties);
+                    zbLv.setAdapter(zhibanInfoAdapter);
+                },Throwable::printStackTrace);
     }
 
     private void initView() {
@@ -53,6 +132,17 @@ public class ZhibanInfoActivity extends BaseActivity implements AdapterView.OnIt
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Intent intent = new Intent(ZhibanInfoActivity.this, ZhibanDetailsActivity.class);
         intent.putExtra("dutyId", planDuties.get(position).getDutyId());
+        intent.putExtra("dutyTime", planDuties.get(position).getDutyDate());
+        intent.putExtra("dutyLeader", planDuties.get(position).getLeader());
+        String type = planDuties.get(position).getType();
+        if (type.equals("0")) {
+            intent.putExtra("dutyPersonMorning", planDuties.get(position).getMorning());
+        } else if (type.equals("1")) {
+            intent.putExtra("dutyPersonNoon", planDuties.get(position).getNoon());
+        } else if (type.equals("2")) {
+            intent.putExtra("dutyPersonEvening", planDuties.get(position).getEvening());
+        }
+        intent.putExtra("shift", type);
         startActivity(intent);
     }
 

app/src/main/java/cn/bsl/bxbg/zhiban/view/ZhibanTableActivity.java

@@ -35,7 +35,16 @@ public class ZhibanTableActivity extends BaseActivity {
         setContentView(R.layout.activity_zhiban_table);
         ButterKnife.bind(this);
 //        zbTableLv.setAdapter(new ZhibanTableAdapter(TestBean.testBeen()));
-        queryRecord();
+//        queryRecord();
+        initData();
+    }
+
+    private void initData() {
+        dutyPlanClient.dutiesRecord()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(ccDuties -> zbTableLv.setAdapter(new ZhibanTableAdapter(ccDuties))
+                        ,Throwable::printStackTrace);
     }
 
     private void queryRecord() {
@@ -73,8 +82,10 @@ public class ZhibanTableActivity extends BaseActivity {
                 .subscribe(new Consumer<List<DutyPlanDutiesBean>>() {
                     @Override
                     public void accept(List<DutyPlanDutiesBean> dutyPlanDutiesBeen) throws Exception {
-                        zbTableLv.setAdapter(new ZhibanTableAdapter(dutyPlanDutiesBeen));
+
                     }
                 }, Throwable::printStackTrace);
     }
+
+
 }

app/src/main/res/drawable/checkbox_style.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/check_all" android:state_checked="true"/>
+    <item android:drawable="@drawable/check_no" android:state_checked="false"/>
+    <item android:drawable="@drawable/check_no"/>
+
+</selector>
\ No newline at end of file

app/src/main/res/drawable/dialog_loading1.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/loding2"
+    android:pivotX="50.0%"
+    android:pivotY="50.0%" />

app/src/main/res/layout/activity_add_meeting_person.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#fff"
+    android:orientation="vertical">
+
+    <include layout="@layout/conn" />
+
+    <Button
+        android:id="@+id/bt_select"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:clickable="false"
+        android:text="按职位选择"
+        android:visibility="gone" />
+
+    <RadioGroup
+        android:id="@+id/radio_group"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="#fff"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        android:padding="3dp">
+
+        <RadioButton
+            android:id="@+id/radio_butten01"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="部门分组"
+            android:textColor="#333333"
+            android:textSize="@dimen/detail_left_text_size" />
+
+        <RadioButton
+            android:id="@+id/radio_butten02"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:text="群组"
+            />
+    </RadioGroup>
+
+    <RelativeLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/activity_duty_transfer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+
+    tools:context="cn.bsl.bxbg.zhiban.view.DutyTransferActivity">
+
+    <include layout="@layout/conn" />
+
+    <android.support.design.widget.TabLayout
+        android:id="@+id/jj_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#FFF"
+        app:tabSelectedTextColor="@color/colorAccent"
+        >
+
+    </android.support.design.widget.TabLayout>
+    <android.support.v4.view.ViewPager
+        android:id="@+id/jj_viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </android.support.v4.view.ViewPager>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:visibility="gone"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已交班"
+            />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:visibility="gone"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="待接班"
+            />
+    </LinearLayout>
+</LinearLayout>

app/src/main/res/layout/activity_main.xml

@@ -10,7 +10,9 @@
     <include layout="@layout/conn" />
     <ImageView
         android:layout_width="match_parent"
-        android:layout_height="120dp" />
+        android:layout_height="wrap_content"
+        android:background="@drawable/banner"
+        />
     <GridView
         android:id="@+id/home_gv"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_tiao_ban_publish.xml

@@ -25,7 +25,12 @@
         android:background="@null"
         android:gravity="top"
         android:hint="请输入原因" />
-
+    <CheckBox
+        android:id="@+id/daibanLeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="带班领导"
+        />
     <LinearLayout
         android:id="@+id/choose_time"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_tiaoban_details.xml

@@ -79,6 +79,30 @@
             android:textSize="16sp"
             />
     </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="20dp"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:textColor="#000"
+            android:text="值班部门"
+            />
+        <TextView
+            android:id="@+id/duty_dept"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="部门"
+            android:layout_marginLeft="10dp"
+            android:textSize="16sp"
+            />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/activity_tiaoban_record.xml

@@ -8,9 +8,20 @@
     tools:context="cn.bsl.bxbg.zhiban.view.TiaobanRecordActivity">
 
     <include layout="@layout/conn" />
-    <ListView
-        android:id="@+id/tbLv"
+    <android.support.design.widget.TabLayout
+        android:id="@+id/tb_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="wrap_content"
+        android:background="#FFF"
+        app:tabSelectedTextColor="@color/colorAccent"
+        >
+
+    </android.support.design.widget.TabLayout>
+    <android.support.v4.view.ViewPager
+        android:id="@+id/tb_viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </android.support.v4.view.ViewPager>
 
 </LinearLayout>

app/src/main/res/layout/activity_tiaoban_record2.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="cn.bsl.bxbg.zhiban.view.TiaobanRecordActivity">
+
+    <include layout="@layout/conn" />
+    <ListView
+        android:id="@+id/tbLv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>

app/src/main/res/layout/item_zhiban_info.xml

@@ -31,6 +31,7 @@
             >
 
             <TextView
+                android:id="@+id/zb_name_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="值班领导:"

app/src/main/res/layout/pop_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    
+    <ListView 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/pop_list"
+        android:divider="#e8e8e8"
+        android:scrollbars="none"
+        android:dividerHeight="1dp"/>
+
+</LinearLayout>

settings.gradle

-include ':app'
+include ':app', ':treeview_lib'