diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index b804659..453b26b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageHandledAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { +public class PackageHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { private Context context; @BindView(R.id.emptyView) @@ -41,12 +42,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListHandledPresenterImpl handledPresenter; + private PkgAndDeptHandledListPresenterImpl handledPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageHandledAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -60,8 +61,8 @@ @Override protected void initData() { - handledPresenter = new PackageListHandledPresenterImpl(this); - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -74,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -82,13 +83,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -111,7 +112,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.handledPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); } else if (msg.what == 2021060301) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -121,11 +122,11 @@ handledFragment.emptyView.show("您暂时没有待办案卷", null); } else { handledFragment.emptyView.hide(); - handledFragment.adapter = new PackageHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.adapter = new PackageCaseAdapter(handledFragment.context, handledFragment.dataBeans); handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); - handledFragment.adapter.setOnItemClickListener(new PackageHandledAdapter.OnItemClickListener() { + handledFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); @@ -140,9 +141,9 @@ } @Override - public void obtainPackageHandledResult(PackageHandledBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index b804659..453b26b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageHandledAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { +public class PackageHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { private Context context; @BindView(R.id.emptyView) @@ -41,12 +42,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListHandledPresenterImpl handledPresenter; + private PkgAndDeptHandledListPresenterImpl handledPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageHandledAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -60,8 +61,8 @@ @Override protected void initData() { - handledPresenter = new PackageListHandledPresenterImpl(this); - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -74,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -82,13 +83,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -111,7 +112,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.handledPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); } else if (msg.what == 2021060301) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -121,11 +122,11 @@ handledFragment.emptyView.show("您暂时没有待办案卷", null); } else { handledFragment.emptyView.hide(); - handledFragment.adapter = new PackageHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.adapter = new PackageCaseAdapter(handledFragment.context, handledFragment.dataBeans); handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); - handledFragment.adapter.setOnItemClickListener(new PackageHandledAdapter.OnItemClickListener() { + handledFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); @@ -140,9 +141,9 @@ } @Override - public void obtainPackageHandledResult(PackageHandledBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 56e1f61..c30e7a6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageTodoAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { +public class PackageTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -42,12 +43,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListTodoPresenterImpl todoPresenter; + private PkgAndDeptTodoListPresenterImpl todoPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageTodoAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -61,8 +62,8 @@ @Override protected void initData() { - todoPresenter = new PackageListTodoPresenterImpl(this); - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter = new PkgAndDeptTodoListPresenterImpl(this); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -75,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,13 +84,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -112,7 +113,7 @@ todoFragment.isRefresh = true; //刷新之后页码重置 todoFragment.pageIndex = 1; - todoFragment.todoPresenter.onReadyRetrofitRequest(todoFragment.pageIndex); + todoFragment.todoPresenter.onReadyRetrofitRequest("1", todoFragment.pageIndex); } else if (msg.what == 2021060302) { if (todoFragment.isRefresh || todoFragment.isLoadMore) { todoFragment.adapter.notifyDataSetChanged(); @@ -122,11 +123,11 @@ todoFragment.emptyView.show("您暂时没有待办案卷", null); } else { todoFragment.emptyView.hide(); - todoFragment.adapter = new PackageTodoAdapter(todoFragment.context, todoFragment.dataBeans); + todoFragment.adapter = new PackageCaseAdapter(todoFragment.context, todoFragment.dataBeans); todoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(todoFragment.context)); todoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(todoFragment.context, DividerItemDecoration.VERTICAL)); todoFragment.caseRecyclerView.setAdapter(todoFragment.adapter); - todoFragment.adapter.setOnItemClickListener(new PackageTodoAdapter.OnItemClickListener() { + todoFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(todoFragment.context, PackageTodoDetailActivity.class); @@ -141,9 +142,9 @@ } @Override - public void obtainPackageTodoResult(PackageTodoBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index b804659..453b26b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageHandledAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { +public class PackageHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { private Context context; @BindView(R.id.emptyView) @@ -41,12 +42,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListHandledPresenterImpl handledPresenter; + private PkgAndDeptHandledListPresenterImpl handledPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageHandledAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -60,8 +61,8 @@ @Override protected void initData() { - handledPresenter = new PackageListHandledPresenterImpl(this); - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -74,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -82,13 +83,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -111,7 +112,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.handledPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); } else if (msg.what == 2021060301) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -121,11 +122,11 @@ handledFragment.emptyView.show("您暂时没有待办案卷", null); } else { handledFragment.emptyView.hide(); - handledFragment.adapter = new PackageHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.adapter = new PackageCaseAdapter(handledFragment.context, handledFragment.dataBeans); handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); - handledFragment.adapter.setOnItemClickListener(new PackageHandledAdapter.OnItemClickListener() { + handledFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); @@ -140,9 +141,9 @@ } @Override - public void obtainPackageHandledResult(PackageHandledBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 56e1f61..c30e7a6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageTodoAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { +public class PackageTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -42,12 +43,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListTodoPresenterImpl todoPresenter; + private PkgAndDeptTodoListPresenterImpl todoPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageTodoAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -61,8 +62,8 @@ @Override protected void initData() { - todoPresenter = new PackageListTodoPresenterImpl(this); - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter = new PkgAndDeptTodoListPresenterImpl(this); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -75,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,13 +84,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -112,7 +113,7 @@ todoFragment.isRefresh = true; //刷新之后页码重置 todoFragment.pageIndex = 1; - todoFragment.todoPresenter.onReadyRetrofitRequest(todoFragment.pageIndex); + todoFragment.todoPresenter.onReadyRetrofitRequest("1", todoFragment.pageIndex); } else if (msg.what == 2021060302) { if (todoFragment.isRefresh || todoFragment.isLoadMore) { todoFragment.adapter.notifyDataSetChanged(); @@ -122,11 +123,11 @@ todoFragment.emptyView.show("您暂时没有待办案卷", null); } else { todoFragment.emptyView.hide(); - todoFragment.adapter = new PackageTodoAdapter(todoFragment.context, todoFragment.dataBeans); + todoFragment.adapter = new PackageCaseAdapter(todoFragment.context, todoFragment.dataBeans); todoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(todoFragment.context)); todoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(todoFragment.context, DividerItemDecoration.VERTICAL)); todoFragment.caseRecyclerView.setAdapter(todoFragment.adapter); - todoFragment.adapter.setOnItemClickListener(new PackageTodoAdapter.OnItemClickListener() { + todoFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(todoFragment.context, PackageTodoDetailActivity.class); @@ -141,9 +142,9 @@ } @Override - public void obtainPackageTodoResult(PackageTodoBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index d755dd9..b65c45f 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseVerifiedResultAdapter; +import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifiedView { +public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifyView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,11 +45,11 @@ RecyclerView caseRecyclerView; private CaseVerifiedPresenterImpl caseVerifiedPresenter; private int pageIndex = 1; - private CaseVerifiedResultAdapter adapter; + private CaseVerifyResultAdapter adapter; /** * 临时存储网络请求到的数据 */ - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +66,7 @@ @Override protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +79,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +87,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +117,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +127,11 @@ verifiedFragment.emptyView.show("您还没有已办案卷", null); } else { verifiedFragment.emptyView.hide(); - verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.adapter = new CaseVerifyResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); - verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); @@ -146,10 +146,10 @@ } @Override - public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { + public void obtainVerifyListResult(CaseVerifyBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index b804659..453b26b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageHandledAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { +public class PackageHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { private Context context; @BindView(R.id.emptyView) @@ -41,12 +42,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListHandledPresenterImpl handledPresenter; + private PkgAndDeptHandledListPresenterImpl handledPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageHandledAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -60,8 +61,8 @@ @Override protected void initData() { - handledPresenter = new PackageListHandledPresenterImpl(this); - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -74,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -82,13 +83,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -111,7 +112,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.handledPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); } else if (msg.what == 2021060301) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -121,11 +122,11 @@ handledFragment.emptyView.show("您暂时没有待办案卷", null); } else { handledFragment.emptyView.hide(); - handledFragment.adapter = new PackageHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.adapter = new PackageCaseAdapter(handledFragment.context, handledFragment.dataBeans); handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); - handledFragment.adapter.setOnItemClickListener(new PackageHandledAdapter.OnItemClickListener() { + handledFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); @@ -140,9 +141,9 @@ } @Override - public void obtainPackageHandledResult(PackageHandledBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 56e1f61..c30e7a6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageTodoAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { +public class PackageTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -42,12 +43,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListTodoPresenterImpl todoPresenter; + private PkgAndDeptTodoListPresenterImpl todoPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageTodoAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -61,8 +62,8 @@ @Override protected void initData() { - todoPresenter = new PackageListTodoPresenterImpl(this); - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter = new PkgAndDeptTodoListPresenterImpl(this); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -75,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,13 +84,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -112,7 +113,7 @@ todoFragment.isRefresh = true; //刷新之后页码重置 todoFragment.pageIndex = 1; - todoFragment.todoPresenter.onReadyRetrofitRequest(todoFragment.pageIndex); + todoFragment.todoPresenter.onReadyRetrofitRequest("1", todoFragment.pageIndex); } else if (msg.what == 2021060302) { if (todoFragment.isRefresh || todoFragment.isLoadMore) { todoFragment.adapter.notifyDataSetChanged(); @@ -122,11 +123,11 @@ todoFragment.emptyView.show("您暂时没有待办案卷", null); } else { todoFragment.emptyView.hide(); - todoFragment.adapter = new PackageTodoAdapter(todoFragment.context, todoFragment.dataBeans); + todoFragment.adapter = new PackageCaseAdapter(todoFragment.context, todoFragment.dataBeans); todoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(todoFragment.context)); todoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(todoFragment.context, DividerItemDecoration.VERTICAL)); todoFragment.caseRecyclerView.setAdapter(todoFragment.adapter); - todoFragment.adapter.setOnItemClickListener(new PackageTodoAdapter.OnItemClickListener() { + todoFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(todoFragment.context, PackageTodoDetailActivity.class); @@ -141,9 +142,9 @@ } @Override - public void obtainPackageTodoResult(PackageTodoBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index d755dd9..b65c45f 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseVerifiedResultAdapter; +import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifiedView { +public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifyView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,11 +45,11 @@ RecyclerView caseRecyclerView; private CaseVerifiedPresenterImpl caseVerifiedPresenter; private int pageIndex = 1; - private CaseVerifiedResultAdapter adapter; + private CaseVerifyResultAdapter adapter; /** * 临时存储网络请求到的数据 */ - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +66,7 @@ @Override protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +79,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +87,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +117,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +127,11 @@ verifiedFragment.emptyView.show("您还没有已办案卷", null); } else { verifiedFragment.emptyView.hide(); - verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.adapter = new CaseVerifyResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); - verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); @@ -146,10 +146,10 @@ } @Override - public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { + public void obtainVerifyListResult(CaseVerifyBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e664e81..b9bedb4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,7 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; - public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待办任务", "待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( @@ -62,6 +62,7 @@ public static final int UPLOAD_LOCATION = 20; public static final int MESSAGE_NUMBER = 21; public static final int PACKAGE_DONE = 22; + public static final int DEPT_DONE = 23; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index b804659..453b26b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageHandledAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { +public class PackageHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { private Context context; @BindView(R.id.emptyView) @@ -41,12 +42,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListHandledPresenterImpl handledPresenter; + private PkgAndDeptHandledListPresenterImpl handledPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageHandledAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -60,8 +61,8 @@ @Override protected void initData() { - handledPresenter = new PackageListHandledPresenterImpl(this); - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -74,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -82,13 +83,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -111,7 +112,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.handledPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); } else if (msg.what == 2021060301) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -121,11 +122,11 @@ handledFragment.emptyView.show("您暂时没有待办案卷", null); } else { handledFragment.emptyView.hide(); - handledFragment.adapter = new PackageHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.adapter = new PackageCaseAdapter(handledFragment.context, handledFragment.dataBeans); handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); - handledFragment.adapter.setOnItemClickListener(new PackageHandledAdapter.OnItemClickListener() { + handledFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); @@ -140,9 +141,9 @@ } @Override - public void obtainPackageHandledResult(PackageHandledBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 56e1f61..c30e7a6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageTodoAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { +public class PackageTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -42,12 +43,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListTodoPresenterImpl todoPresenter; + private PkgAndDeptTodoListPresenterImpl todoPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageTodoAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -61,8 +62,8 @@ @Override protected void initData() { - todoPresenter = new PackageListTodoPresenterImpl(this); - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter = new PkgAndDeptTodoListPresenterImpl(this); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -75,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,13 +84,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -112,7 +113,7 @@ todoFragment.isRefresh = true; //刷新之后页码重置 todoFragment.pageIndex = 1; - todoFragment.todoPresenter.onReadyRetrofitRequest(todoFragment.pageIndex); + todoFragment.todoPresenter.onReadyRetrofitRequest("1", todoFragment.pageIndex); } else if (msg.what == 2021060302) { if (todoFragment.isRefresh || todoFragment.isLoadMore) { todoFragment.adapter.notifyDataSetChanged(); @@ -122,11 +123,11 @@ todoFragment.emptyView.show("您暂时没有待办案卷", null); } else { todoFragment.emptyView.hide(); - todoFragment.adapter = new PackageTodoAdapter(todoFragment.context, todoFragment.dataBeans); + todoFragment.adapter = new PackageCaseAdapter(todoFragment.context, todoFragment.dataBeans); todoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(todoFragment.context)); todoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(todoFragment.context, DividerItemDecoration.VERTICAL)); todoFragment.caseRecyclerView.setAdapter(todoFragment.adapter); - todoFragment.adapter.setOnItemClickListener(new PackageTodoAdapter.OnItemClickListener() { + todoFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(todoFragment.context, PackageTodoDetailActivity.class); @@ -141,9 +142,9 @@ } @Override - public void obtainPackageTodoResult(PackageTodoBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index d755dd9..b65c45f 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseVerifiedResultAdapter; +import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifiedView { +public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifyView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,11 +45,11 @@ RecyclerView caseRecyclerView; private CaseVerifiedPresenterImpl caseVerifiedPresenter; private int pageIndex = 1; - private CaseVerifiedResultAdapter adapter; + private CaseVerifyResultAdapter adapter; /** * 临时存储网络请求到的数据 */ - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +66,7 @@ @Override protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +79,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +87,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +117,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +127,11 @@ verifiedFragment.emptyView.show("您还没有已办案卷", null); } else { verifiedFragment.emptyView.hide(); - verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.adapter = new CaseVerifyResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); - verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); @@ -146,10 +146,10 @@ } @Override - public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { + public void obtainVerifyListResult(CaseVerifyBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e664e81..b9bedb4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,7 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; - public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待办任务", "待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( @@ -62,6 +62,7 @@ public static final int UPLOAD_LOCATION = 20; public static final int MESSAGE_NUMBER = 21; public static final int PACKAGE_DONE = 22; + public static final int DEPT_DONE = 23; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 4063d6a..eba27bd 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.bean.CaseCheckedBean; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; @@ -12,7 +11,6 @@ import com.casic.dcms.bean.CaseProcessBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.CaseStatusBean; -import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.bean.CommonSentenceBean; @@ -24,9 +22,8 @@ import com.casic.dcms.bean.NewVersionBean; import com.casic.dcms.bean.OnlinePersonBean; import com.casic.dcms.bean.OvertimeCaseBean; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PackageTodoBean; import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.bean.UserBean; @@ -240,9 +237,9 @@ * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable obtainCaseVerifiedList(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 @@ -256,9 +253,9 @@ * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable obtainCaseCheckedList(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 上传案卷图片 @@ -485,23 +482,53 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainWorkListPage(@Header("token") String token, - @Query("isShop") String isShop, - @Query("limit") int limit, - @Query("offset") int offset); + Observable obtainWorkListPage(@Header("token") String token, + @Query("isShop") String isShop, + @Query("limit") int limit, + @Query("offset") int offset); /** * 三包已办 *

- * http://111.198.10.15:11409/case/completedListPage?isShop=1 + * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage(@Header("token") String token, - @Query("isShop") String isShop, + Observable obtainCompletedListPage(@Header("token") String token, + @Query("isShop") String isShop, + @Query("limit") int limit, + @Query("offset") int offset); + + /** + * 二级派遣员待办任务 + *

+ * http://111.198.10.15:11409/case/workListPage?offset=1&limit=15 + */ + @GET("/case/workListPage") + Observable obtainWorkListPage(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); + + /** + * 二级派遣员待处理案卷 + *

+ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 + */ + @GET("/case/toProcessListPage") + Observable obtainProcessListPage(@Header("token") String token, @Query("limit") int limit, @Query("offset") int offset); /** + * 二级派遣员已办案卷 + *

+ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 + */ + @GET("/case/completedListPage") + Observable obtainCompletedListPage(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); + + /** * 三包处罚 *

* http://111.198.10.15:11409/case/update diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java deleted file mode 100644 index 7eb9d95..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseCheckedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseCheckedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseCheckedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseCheckedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseCheckedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseCheckedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseCheckedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseCheckedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java deleted file mode 100644 index 57d4815..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifiedResultAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; - -import com.casic.dcms.R; -import com.casic.dcms.bean.CaseVerifiedBean; -import com.casic.dcms.utils.StringHelper; - -import java.util.List; - -public class CaseVerifiedResultAdapter extends RecyclerView.Adapter { - - private List dataBeans; - private LayoutInflater layoutInflater; - - public CaseVerifiedResultAdapter(Context context, List dataRows) { - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - } - - @NonNull - @Override - public CaseVerifiedResultAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); - return new CaseVerifiedResultAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull CaseVerifiedResultAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - static class ItemViewHolder extends RecyclerView.ViewHolder { - - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftTextView = itemView.findViewById(R.id.leftTextView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - casePlaceView = itemView.findViewById(R.id.casePlaceView); - caseTimeView = itemView.findViewById(R.id.caseTimeView); - } - - @SuppressLint("SetTextI18n") - void bindView(CaseVerifiedBean.DataBean.RowsBean rowsBean) { - String eorcName = rowsBean.getEorcName(); - if (TextUtils.isEmpty(eorcName)) { - eorcName = "未知"; - } - leftTextView.setText(eorcName.substring(0, 1)); - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); - caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java new file mode 100644 index 0000000..e144b1f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/DeptHandleCaseAdapter.java @@ -0,0 +1,97 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.StringHelper; + +import java.util.List; + +/** + * {@link PackageCaseAdapter 不适用二级派遣员部门处置列表，因为该列表不光有三包案卷，还有普通案卷} + */ +public class DeptHandleCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "DeptHandleCaseAdapter"; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + + public DeptHandleCaseAdapter(Context context, List dataRows) { + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + } + + @NonNull + @Override + public DeptHandleCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_case_recycleview, parent, false); + return new ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull DeptHandleCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + static class ItemViewHolder extends RecyclerView.ViewHolder { + + private TextView leftTextView; + private TextView caseTitleView; + private TextView casePlaceView; + private TextView caseTimeView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftTextView = itemView.findViewById(R.id.leftTextView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + casePlaceView = itemView.findViewById(R.id.casePlaceView); + caseTimeView = itemView.findViewById(R.id.caseTimeView); + } + + @SuppressLint("SetTextI18n") + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + String eorcName = rowsBean.getEorcName(); + if (TextUtils.isEmpty(eorcName)) { + eorcName = "未知"; + } + leftTextView.setText(eorcName.substring(0, 1)); + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + casePlaceView.setText("发生地点：" + StringHelper.filterString(rowsBean.getFieldintro())); + caseTimeView.setText("上报时间：" + rowsBean.getReportTime()); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java new file mode 100644 index 0000000..645c3d0 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseAdapter.java @@ -0,0 +1,180 @@ +package com.casic.dcms.adapter; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.casic.dcms.R; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.bean.PunishTimesBean; +import com.casic.dcms.bean.PunishTypeBean; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.HttpRequestHelper; +import com.casic.dcms.utils.StringHelper; +import com.casic.dcms.utils.callback.IHttpRequestListener; +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.util.List; + +import okhttp3.ResponseBody; + +@SuppressLint("SetTextI18n") +public class PackageCaseAdapter extends RecyclerView.Adapter { + + private static final String TAG = "PackageCaseAdapter"; + private Context context; + private List dataBeans; + private LayoutInflater layoutInflater; + private PunishTypeAdapter adapter; + private Gson gson; + + public PackageCaseAdapter(Context context, List dataRows) { + this.context = context; + this.dataBeans = dataRows; + layoutInflater = LayoutInflater.from(context); + gson = new Gson(); + } + + @NonNull + @Override + public PackageCaseAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); + return new PackageCaseAdapter.ItemViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull PackageCaseAdapter.ItemViewHolder holder, int position) { + holder.bindView(dataBeans.get(position)); + if (clickListener != null) { + holder.itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + clickListener.onClick(position); + } + }); + } + } + + @Override + public int getItemCount() { + return dataBeans.size(); + } + + class ItemViewHolder extends RecyclerView.ViewHolder { + + private ImageView leftImageView; + private TextView caseTitleView; + private TextView caseDateView; + private RecyclerView punishRecyclerView; + + ItemViewHolder(@NonNull View itemView) { + super(itemView); + leftImageView = itemView.findViewById(R.id.leftImageView); + caseTitleView = itemView.findViewById(R.id.caseTitleView); + caseDateView = itemView.findViewById(R.id.caseDateView); + punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); + } + + + void bindView(PkgAndDeptHandleBean.DataBean.RowsBean rowsBean) { + caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); + caseDateView.setText("上报时间：" + rowsBean.getReportTime()); + HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + String string = resultBean.string(); + JSONObject jsonObject = new JSONObject(string); + int code = jsonObject.getInt("code"); + if (code == 500) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject data = jsonObject.getJSONObject("data"); + if (data.length() == 0) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + JSONObject merchantInfo = data.getJSONObject("merchantInfo"); + String images = merchantInfo.getString("images"); + if (images.equals("")) { + leftImageView.setBackgroundResource(R.drawable.ic_load_error); + } else { + String img = images.split(",")[0]; + Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); + } + } + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); + if (punishTypeBean.getData().size() != 0) { + //获取商铺处罚次数 + HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { + @Override + public void onSuccess(ResponseBody resultBean) { + try { + PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); + + adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); + LinearLayoutManager layoutManager = new LinearLayoutManager(context); + layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + punishRecyclerView.setLayoutManager(layoutManager); + punishRecyclerView.setAdapter(adapter); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onFailure(Throwable throwable) { + + } + }); + } + } + + private OnItemClickListener clickListener; + + public interface OnItemClickListener { + void onClick(int position); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.clickListener = onItemClickListener; + } +} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java deleted file mode 100644 index 42652aa..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageHandledAdapter.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageHandledAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageHandledAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageHandledAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageHandledAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageHandledAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageHandledAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - void bindView(PackageHandledBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - //获取商铺图标 - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - - //获取商铺处罚记录 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java deleted file mode 100644 index 2f9aa17..0000000 --- a/app/src/main/java/com/casic/dcms/adapter/PackageTodoAdapter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.casic.dcms.adapter; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.bumptech.glide.Glide; -import com.casic.dcms.R; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.bean.PunishTimesBean; -import com.casic.dcms.bean.PunishTypeBean; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.HttpRequestHelper; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.utils.callback.IHttpRequestListener; -import com.google.gson.Gson; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.List; - -import okhttp3.ResponseBody; - -@SuppressLint("SetTextI18n") -public class PackageTodoAdapter extends RecyclerView.Adapter { - - private static final String TAG = "PackageTodoAdapter"; - private Context context; - private List dataBeans; - private LayoutInflater layoutInflater; - private PunishTypeAdapter adapter; - private Gson gson; - - public PackageTodoAdapter(Context context, List dataRows) { - this.context = context; - this.dataBeans = dataRows; - layoutInflater = LayoutInflater.from(context); - gson = new Gson(); - } - - @NonNull - @Override - public PackageTodoAdapter.ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = layoutInflater.inflate(R.layout.item_package_recycleview, parent, false); - return new PackageTodoAdapter.ItemViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull PackageTodoAdapter.ItemViewHolder holder, int position) { - holder.bindView(dataBeans.get(position)); - if (clickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - clickListener.onClick(position); - } - }); - } - } - - @Override - public int getItemCount() { - return dataBeans.size(); - } - - class ItemViewHolder extends RecyclerView.ViewHolder { - - private ImageView leftImageView; - private TextView caseTitleView; - private TextView caseDateView; - private RecyclerView punishRecyclerView; - - ItemViewHolder(@NonNull View itemView) { - super(itemView); - leftImageView = itemView.findViewById(R.id.leftImageView); - caseTitleView = itemView.findViewById(R.id.caseTitleView); - caseDateView = itemView.findViewById(R.id.caseDateView); - punishRecyclerView = itemView.findViewById(R.id.punishRecyclerView); - } - - - void bindView(PackageTodoBean.DataBean.RowsBean rowsBean) { - caseTitleView.setText(StringHelper.filterString(rowsBean.getDescription())); - caseDateView.setText("上报时间：" + rowsBean.getReportTime()); - HttpRequestHelper.doRequest(Constant.SHOP_DETAIL, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - String string = resultBean.string(); - JSONObject jsonObject = new JSONObject(string); - int code = jsonObject.getInt("code"); - if (code == 500) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject data = jsonObject.getJSONObject("data"); - if (data.length() == 0) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - JSONObject merchantInfo = data.getJSONObject("merchantInfo"); - String images = merchantInfo.getString("images"); - if (images.equals("")) { - leftImageView.setBackgroundResource(R.drawable.ic_load_error); - } else { - String img = images.split(",")[0]; - Glide.with(context).load(StringHelper.appendCompleteURL(img)).into(leftImageView); - } - } - } - } catch (JSONException | IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_LIST, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTypeBean punishTypeBean = gson.fromJson(resultBean.string(), PunishTypeBean.class); - if (punishTypeBean.getData().size() != 0) { - //获取商铺处罚次数 - HttpRequestHelper.doRequest(Constant.SHOP_PUNISH_TYPE, rowsBean.getShopId(), new IHttpRequestListener() { - @Override - public void onSuccess(ResponseBody resultBean) { - try { - PunishTimesBean punishTimesBean = gson.fromJson(resultBean.string(), PunishTimesBean.class); - - adapter = new PunishTypeAdapter(context, punishTypeBean.getData(), punishTimesBean.getData()); - LinearLayoutManager layoutManager = new LinearLayoutManager(context); - layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); - punishRecyclerView.setLayoutManager(layoutManager); - punishRecyclerView.setAdapter(adapter); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onFailure(Throwable throwable) { - - } - }); - } - } - - private OnItemClickListener clickListener; - - public interface OnItemClickListener { - void onClick(int position); - } - - public void setOnItemClickListener(OnItemClickListener onItemClickListener) { - this.clickListener = onItemClickListener; - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java index a967810..6bdd5f6 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseCheckBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核查-已办/待办共用一个Bean + */ public class CaseCheckBean { private double code; private DataBean data; diff --git a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java deleted file mode 100644 index d3d2fe7..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseCheckedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseCheckedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java deleted file mode 100644 index 9371e43..0000000 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifiedBean.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class CaseVerifiedBean { - - private double code; - private DataBean data; - private String message; - private boolean success; - - public double getCode() { - return code; - } - - public void setCode(double code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private double total; - private List rows; - - public double getTotal() { - return total; - } - - public void setTotal(double total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - - private double isPostpone; - private String description; - private double source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String processId; - private double caseState; - private String id; - private String fieldintro; - private String lat; - private String caseStateName; - private String lng; - private String isOvertime; - private String fileIdVerify; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String taskName; - private String sourceName; - private String fileIdProcess; - private String reportTime; - - public double getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(double isPostpone) { - this.isPostpone = isPostpone; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public double getSource() { - return source; - } - - public void setSource(double source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public double getCaseState() { - return caseState; - } - - public void setCaseState(double caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getFileIdVerify() { - return fileIdVerify; - } - - public void setFileIdVerify(String fileIdVerify) { - this.fileIdVerify = fileIdVerify; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getTaskName() { - return taskName; - } - - public void setTaskName(String taskName) { - this.taskName = taskName; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getFileIdProcess() { - return fileIdProcess; - } - - public void setFileIdProcess(String fileIdProcess) { - this.fileIdProcess = fileIdProcess; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java index 224f288..f6d61bd 100644 --- a/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java +++ b/app/src/main/java/com/casic/dcms/bean/CaseVerifyBean.java @@ -2,6 +2,9 @@ import java.util.List; +/** + * 核实-已办/待办共用一个Bean + */ public class CaseVerifyBean { private double code; diff --git a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java b/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java deleted file mode 100644 index eb011e1..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageHandledBean.java +++ /dev/null @@ -1,381 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageHandledBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - /** - * isPostpone : 0 - * preState : 50 - * description : qk - * source : 2 - * eorcName : 事件 - * casetypeDetailName : 店面无证装修 - * remainingTime : 超时121小时39分钟 - * casetypeName : 市容环境 - * currUserId : 1196382448976011266 - * currUserName : 房可鑫 - * processId : 2858459 - * caseState : 51 - * id : 1395556091536478210 - * shopId : 993 - * fieldintro : dd - * lat : 27.770741787627987 - * caseStateName : 现场核查 - * preOperator : 1394585656711962626 - * lng : 116.05567507482945 - * isOvertime : 1 - * currRoleName : 监督员 - * casetypeDetailCode : 02 - * onedeptid : 1177028662545973250 - * eorc : 1 - * currRoleId : supervisor - * caseid : 202105210004 - * casetypeCode : 01 - * nodeLimittime : 2021-05-29 17:22:56 - * sourceName : 终端-普通上报 - * reportTime : 2021-05-21 09:44:35 - * onedeptName : 桥南中队 - */ - - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java b/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java deleted file mode 100644 index 8e7626d..0000000 --- a/app/src/main/java/com/casic/dcms/bean/PackageTodoBean.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.casic.dcms.bean; - -import java.util.List; - -public class PackageTodoBean { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - - private int total; - private List rows; - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public static class RowsBean { - private int isPostpone; - private int preState; - private String description; - private int source; - private String eorcName; - private String casetypeDetailName; - private String remainingTime; - private String casetypeName; - private String currUserId; - private String currUserName; - private String processId; - private int caseState; - private String id; - private String shopId; - private String fieldintro; - private String lat; - private String caseStateName; - private String preOperator; - private String lng; - private String isOvertime; - private String currRoleName; - private String casetypeDetailCode; - private String onedeptid; - private String eorc; - private String currRoleId; - private String caseid; - private String casetypeCode; - private String nodeLimittime; - private String sourceName; - private String reportTime; - private String onedeptName; - - public int getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(int isPostpone) { - this.isPostpone = isPostpone; - } - - public int getPreState() { - return preState; - } - - public void setPreState(int preState) { - this.preState = preState; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getSource() { - return source; - } - - public void setSource(int source) { - this.source = source; - } - - public String getEorcName() { - return eorcName; - } - - public void setEorcName(String eorcName) { - this.eorcName = eorcName; - } - - public String getCasetypeDetailName() { - return casetypeDetailName; - } - - public void setCasetypeDetailName(String casetypeDetailName) { - this.casetypeDetailName = casetypeDetailName; - } - - public String getRemainingTime() { - return remainingTime; - } - - public void setRemainingTime(String remainingTime) { - this.remainingTime = remainingTime; - } - - public String getCasetypeName() { - return casetypeName; - } - - public void setCasetypeName(String casetypeName) { - this.casetypeName = casetypeName; - } - - public String getCurrUserId() { - return currUserId; - } - - public void setCurrUserId(String currUserId) { - this.currUserId = currUserId; - } - - public String getCurrUserName() { - return currUserName; - } - - public void setCurrUserName(String currUserName) { - this.currUserName = currUserName; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public int getCaseState() { - return caseState; - } - - public void setCaseState(int caseState) { - this.caseState = caseState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public String getCaseStateName() { - return caseStateName; - } - - public void setCaseStateName(String caseStateName) { - this.caseStateName = caseStateName; - } - - public String getPreOperator() { - return preOperator; - } - - public void setPreOperator(String preOperator) { - this.preOperator = preOperator; - } - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getCurrRoleName() { - return currRoleName; - } - - public void setCurrRoleName(String currRoleName) { - this.currRoleName = currRoleName; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCurrRoleId() { - return currRoleId; - } - - public void setCurrRoleId(String currRoleId) { - this.currRoleId = currRoleId; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getNodeLimittime() { - return nodeLimittime; - } - - public void setNodeLimittime(String nodeLimittime) { - this.nodeLimittime = nodeLimittime; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public String getReportTime() { - return reportTime; - } - - public void setReportTime(String reportTime) { - this.reportTime = reportTime; - } - - public String getOnedeptName() { - return onedeptName; - } - - public void setOnedeptName(String onedeptName) { - this.onedeptName = onedeptName; - } - } - } -} diff --git a/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java new file mode 100644 index 0000000..0fbdd92 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/bean/PkgAndDeptHandleBean.java @@ -0,0 +1,351 @@ +package com.casic.dcms.bean; + +import java.util.List; + +/** + * 三包处置和二级派遣员-已办/待办，共用一个Bean + */ +public class PkgAndDeptHandleBean { + + private int code; + private DataBean data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataBean { + + private int total; + private List rows; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public static class RowsBean { + + private int isPostpone; + private int preState; + private String description; + private int source; + private String eorcName; + private String casetypeDetailName; + private String remainingTime; + private String casetypeName; + private String currUserId; + private String currUserName; + private String processId; + private int caseState; + private String id; + private String shopId; + private String fieldintro; + private String lat; + private String caseStateName; + private String preOperator; + private String lng; + private String isOvertime; + private String currRoleName; + private String casetypeDetailCode; + private String onedeptid; + private String eorc; + private String currRoleId; + private String caseid; + private String casetypeCode; + private String nodeLimittime; + private String sourceName; + private String reportTime; + private String onedeptName; + + public int getIsPostpone() { + return isPostpone; + } + + public void setIsPostpone(int isPostpone) { + this.isPostpone = isPostpone; + } + + public int getPreState() { + return preState; + } + + public void setPreState(int preState) { + this.preState = preState; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public int getSource() { + return source; + } + + public void setSource(int source) { + this.source = source; + } + + public String getEorcName() { + return eorcName; + } + + public void setEorcName(String eorcName) { + this.eorcName = eorcName; + } + + public String getCasetypeDetailName() { + return casetypeDetailName; + } + + public void setCasetypeDetailName(String casetypeDetailName) { + this.casetypeDetailName = casetypeDetailName; + } + + public String getRemainingTime() { + return remainingTime; + } + + public void setRemainingTime(String remainingTime) { + this.remainingTime = remainingTime; + } + + public String getCasetypeName() { + return casetypeName; + } + + public void setCasetypeName(String casetypeName) { + this.casetypeName = casetypeName; + } + + public String getCurrUserId() { + return currUserId; + } + + public void setCurrUserId(String currUserId) { + this.currUserId = currUserId; + } + + public String getCurrUserName() { + return currUserName; + } + + public void setCurrUserName(String currUserName) { + this.currUserName = currUserName; + } + + public String getProcessId() { + return processId; + } + + public void setProcessId(String processId) { + this.processId = processId; + } + + public int getCaseState() { + return caseState; + } + + public void setCaseState(int caseState) { + this.caseState = caseState; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getFieldintro() { + return fieldintro; + } + + public void setFieldintro(String fieldintro) { + this.fieldintro = fieldintro; + } + + public String getLat() { + return lat; + } + + public void setLat(String lat) { + this.lat = lat; + } + + public String getCaseStateName() { + return caseStateName; + } + + public void setCaseStateName(String caseStateName) { + this.caseStateName = caseStateName; + } + + public String getPreOperator() { + return preOperator; + } + + public void setPreOperator(String preOperator) { + this.preOperator = preOperator; + } + + public String getLng() { + return lng; + } + + public void setLng(String lng) { + this.lng = lng; + } + + public String getIsOvertime() { + return isOvertime; + } + + public void setIsOvertime(String isOvertime) { + this.isOvertime = isOvertime; + } + + public String getCurrRoleName() { + return currRoleName; + } + + public void setCurrRoleName(String currRoleName) { + this.currRoleName = currRoleName; + } + + public String getCasetypeDetailCode() { + return casetypeDetailCode; + } + + public void setCasetypeDetailCode(String casetypeDetailCode) { + this.casetypeDetailCode = casetypeDetailCode; + } + + public String getOnedeptid() { + return onedeptid; + } + + public void setOnedeptid(String onedeptid) { + this.onedeptid = onedeptid; + } + + public String getEorc() { + return eorc; + } + + public void setEorc(String eorc) { + this.eorc = eorc; + } + + public String getCurrRoleId() { + return currRoleId; + } + + public void setCurrRoleId(String currRoleId) { + this.currRoleId = currRoleId; + } + + public String getCaseid() { + return caseid; + } + + public void setCaseid(String caseid) { + this.caseid = caseid; + } + + public String getCasetypeCode() { + return casetypeCode; + } + + public void setCasetypeCode(String casetypeCode) { + this.casetypeCode = casetypeCode; + } + + public String getNodeLimittime() { + return nodeLimittime; + } + + public void setNodeLimittime(String nodeLimittime) { + this.nodeLimittime = nodeLimittime; + } + + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + public String getReportTime() { + return reportTime; + } + + public void setReportTime(String reportTime) { + this.reportTime = reportTime; + } + + public String getOnedeptName() { + return onedeptName; + } + + public void setOnedeptName(String onedeptName) { + this.onedeptName = onedeptName; + } + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java index 450e710..59800fb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseCheckedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseCheckedModelImpl implements ICaseCheckedModel { +public class CaseCheckedModelImpl implements ICaseCheckModel { private OnGetCaseCheckedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseCheckedListener { - void onSuccess(CaseCheckedBean resultBean); + void onSuccess(CaseCheckBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseCheckedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseCheckedBean resultBean) { + public void onNext(CaseCheckBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java index b2882c1..af4c4de 100644 --- a/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/model/CaseVerifiedModelImpl.java @@ -1,6 +1,6 @@ package com.casic.dcms.mvp.model; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.utils.retrofit.RetrofitServiceManager; import rx.Observable; @@ -9,7 +9,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -public class CaseVerifiedModelImpl implements ICaseVerifiedModel { +public class CaseVerifiedModelImpl implements ICaseVerifyModel { private OnGetCaseVerifiedListener listener; @@ -18,15 +18,15 @@ } public interface OnGetCaseVerifiedListener { - void onSuccess(CaseVerifiedBean resultBean); + void onSuccess(CaseVerifyBean resultBean); void onFailure(Throwable throwable); } @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + public Subscription sendRetrofitRequest(int limit, int offset) { + Observable observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { @Override public void onCompleted() { @@ -40,7 +40,7 @@ } @Override - public void onNext(CaseVerifiedBean resultBean) { + public void onNext(CaseVerifyBean resultBean) { if (resultBean != null) { listener.onSuccess(resultBean); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java deleted file mode 100644 index 487fcb9..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java deleted file mode 100644 index a499d3d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifiedModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifiedModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java deleted file mode 100644 index 14e86fd..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageHandledModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageHandledModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java deleted file mode 100644 index a5d3513..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/IPackageTodoModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface IPackageTodoModel { - Subscription sendRetrofitRequest(int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java new file mode 100644 index 0000000..baef90f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IPkgAndDeptTodoModel.java @@ -0,0 +1,11 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IPkgAndDeptTodoModel { + //三包处置 + Subscription sendRetrofitRequest(String isShop, int offset); + + //二级派遣员处置 + Subscription sendRetrofitRequest(boolean isTodo,int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java deleted file mode 100644 index 5e36209..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListHandledModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListHandledModelImpl implements IPackageHandledModel { - - private OnGetHandledListListener listener; - - public PackageListHandledModelImpl(OnGetHandledListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetHandledListListener { - void onSuccess(PackageHandledBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getCompletedListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageHandledBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java deleted file mode 100644 index 993668b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/PackageListTodoModelImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.mvp.model; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class PackageListTodoModelImpl implements IPackageTodoModel { - - private OnGetTodoListListener listener; - - public PackageListTodoModelImpl(OnGetTodoListListener handledListListener) { - this.listener = handledListListener; - } - - public interface OnGetTodoListListener { - void onSuccess(PackageTodoBean resultBean); - - void onFailure(Throwable throwable); - } - - @Override - public Subscription sendRetrofitRequest(int offset) { - Observable observable = RetrofitServiceManager.getWorkListResult(offset); - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - listener.onFailure(e); - } - } - - @Override - public void onNext(PackageTodoBean resultBean) { - if (resultBean != null) { - listener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java new file mode 100644 index 0000000..0943ed5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptHandledListModelImpl.java @@ -0,0 +1,78 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptHandledListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetHandledListListener listener; + + public PkgAndDeptHandledListModelImpl(OnGetHandledListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetHandledListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + /** + * @param isTodo do nothing + */ + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + Observable observable = RetrofitServiceManager.getCompletedListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java new file mode 100644 index 0000000..fa4c67c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/PkgAndDeptTodoListModelImpl.java @@ -0,0 +1,101 @@ +package com.casic.dcms.mvp.model; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class PkgAndDeptTodoListModelImpl implements IPkgAndDeptTodoModel { + + private OnGetTodoListListener listener; + + public PkgAndDeptTodoListModelImpl(OnGetTodoListListener handledListListener) { + this.listener = handledListListener; + } + + public interface OnGetTodoListListener { + void onSuccess(PkgAndDeptHandleBean resultBean); + + void onFailure(Throwable throwable); + } + + @Override + public Subscription sendRetrofitRequest(String isShop, int offset) { + Observable observable = RetrofitServiceManager.getWorkListResult(isShop, offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + + @Override + public Subscription sendRetrofitRequest(boolean isTodo, int offset) { + if (isTodo) { + //待办 + Observable observable = RetrofitServiceManager.getWorkListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } else { + //待处理 + Observable observable = RetrofitServiceManager.getProcessListResult(offset); + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + listener.onFailure(e); + } + } + + @Override + public void onNext(PkgAndDeptHandleBean resultBean) { + if (resultBean != null) { + listener.onSuccess(resultBean); + } + } + }); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java index 5d5ad5f..bb21709 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckPresenterImpl.java @@ -10,8 +10,8 @@ private ICaseCheckView view; private CaseCheckModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseTodoView) { - this.view = caseTodoView; + public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java index 5c50046..4f5d21f 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseCheckedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseCheckedModelImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckedPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { +public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, CaseCheckedModelImpl.OnGetCaseCheckedListener { - private ICaseCheckedView view; + private ICaseCheckView view; private CaseCheckedModelImpl actionModel; - public CaseCheckedPresenterImpl(ICaseCheckedView caseCheckedView) { - this.view = caseCheckedView; + public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { + this.view = caseCheckView; actionModel = new CaseCheckedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseCheckedBean resultBean) { - view.obtainCheckedListResult(resultBean); + public void onSuccess(CaseCheckBean resultBean) { + view.obtainCheckListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java index 2c1319f..b988b4d 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/CaseVerifiedPresenterImpl.java @@ -1,23 +1,23 @@ package com.casic.dcms.mvp.presenter; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.CaseVerifiedModelImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifiedPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { +public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, CaseVerifiedModelImpl.OnGetCaseVerifiedListener { - private ICaseVerifiedView view; + private ICaseVerifyView view; private CaseVerifiedModelImpl actionModel; - public CaseVerifiedPresenterImpl(ICaseVerifiedView caseVerifiedView) { - this.view = caseVerifiedView; + public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { + this.view = caseVerifyView; actionModel = new CaseVerifiedModelImpl(this); } @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); + public void onReadyRetrofitRequest(int limit, int offset) { + addSubscription(actionModel.sendRetrofitRequest(limit, offset)); } @Override @@ -26,8 +26,8 @@ } @Override - public void onSuccess(CaseVerifiedBean resultBean) { - view.obtainVerifiedListResult(resultBean); + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyListResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java deleted file mode 100644 index 5831fd0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java deleted file mode 100644 index a7f0549..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifiedPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifiedPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java deleted file mode 100644 index dab0ea8..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListHandledPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListHandledPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java deleted file mode 100644 index 8821dc6..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/IPackageListTodoPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface IPackageListTodoPresenter { - void onReadyRetrofitRequest(int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java new file mode 100644 index 0000000..c69f3a8 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IPkgAndDeptPresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IPkgAndDeptPresenter { + void onReadyRetrofitRequest(String isShop, int offset); + + void onReadyRetrofitRequest(boolean isTodo, int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java deleted file mode 100644 index 46f9946..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListHandledPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListHandledModelImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; - -public class PackageListHandledPresenterImpl extends BasePresenter implements IPackageListHandledPresenter, PackageListHandledModelImpl.OnGetHandledListListener { - - private IPackageLIstHandledView view; - private PackageListHandledModelImpl actionModel; - - public PackageListHandledPresenterImpl(IPackageLIstHandledView handledView) { - this.view = handledView; - actionModel = new PackageListHandledModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageHandledBean resultBean) { - view.obtainPackageHandledResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java deleted file mode 100644 index 342af16..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/PackageListTodoPresenterImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.PackageListTodoModelImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; - -public class PackageListTodoPresenterImpl extends BasePresenter implements IPackageListTodoPresenter, PackageListTodoModelImpl.OnGetTodoListListener { - - private IPackageListTodoView view; - private PackageListTodoModelImpl actionModel; - - public PackageListTodoPresenterImpl(IPackageListTodoView packageTodoView) { - this.view = packageTodoView; - actionModel = new PackageListTodoModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendRetrofitRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(PackageTodoBean resultBean) { - view.obtainPackageTodoResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java new file mode 100644 index 0000000..666361e --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptHandledListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptHandledListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptHandledListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptHandledListModelImpl.OnGetHandledListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptHandledListModelImpl actionModel; + + public PkgAndDeptHandledListPresenterImpl(IPkgAndDeptCaseListView handledView) { + this.view = handledView; + actionModel = new PkgAndDeptHandledListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java new file mode 100644 index 0000000..97ea617 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/PkgAndDeptTodoListPresenterImpl.java @@ -0,0 +1,42 @@ +package com.casic.dcms.mvp.presenter; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.PkgAndDeptTodoListModelImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; + +public class PkgAndDeptTodoListPresenterImpl extends BasePresenter implements IPkgAndDeptPresenter, PkgAndDeptTodoListModelImpl.OnGetTodoListListener { + + private IPkgAndDeptCaseListView view; + private PkgAndDeptTodoListModelImpl actionModel; + + public PkgAndDeptTodoListPresenterImpl(IPkgAndDeptCaseListView packageListView) { + this.view = packageListView; + actionModel = new PkgAndDeptTodoListModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isShop, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isShop, offset)); + } + + @Override + public void onReadyRetrofitRequest(boolean isTodo, int offset) { + addSubscription(actionModel.sendRetrofitRequest(isTodo, offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(PkgAndDeptHandleBean resultBean) { + view.obtainPackageCaseResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java deleted file mode 100644 index f0a1b8d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckedBean; - -public interface ICaseCheckedView { - void obtainCheckedListResult(CaseCheckedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java deleted file mode 100644 index 95a76c1..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifiedView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifiedBean; - -public interface ICaseVerifiedView { - void obtainVerifiedListResult(CaseVerifiedBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java deleted file mode 100644 index 525942d..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageLIstHandledView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageHandledBean; - -public interface IPackageLIstHandledView { - void obtainPackageHandledResult(PackageHandledBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java deleted file mode 100644 index 822e1ac..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IPackageListTodoView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.PackageTodoBean; - -public interface IPackageListTodoView { - void obtainPackageTodoResult(PackageTodoBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java new file mode 100644 index 0000000..ae8d8cf --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IPkgAndDeptCaseListView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.PkgAndDeptHandleBean; + +public interface IPkgAndDeptCaseListView { + void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java index ed148f2..7c3c816 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptHandleActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.ui.fragment.dept.DeptCaseDelayedFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseHandledFragment; import com.casic.dcms.ui.fragment.dept.DeptCasePostponeFragment; +import com.casic.dcms.ui.fragment.dept.DeptCaseProcessFragment; import com.casic.dcms.ui.fragment.dept.DeptCaseTodoFragment; import com.casic.dcms.utils.Constant; import com.google.android.material.tabs.TabLayout; @@ -57,7 +58,8 @@ @Override public void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new DeptCaseTodoFragment()); + fragmentList.add(new DeptCaseTodoFragment());//待办 + fragmentList.add(new DeptCaseProcessFragment());//待处理 fragmentList.add(new DeptAuthorizeFragment());//部门授权 fragmentList.add(new DeptAdjustFragment());//部门调整 fragmentList.add(new DeptCasePostponeFragment());//二级缓办 diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index 4bab3fa..4fc4a79 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseCheckedResultAdapter; +import com.casic.dcms.adapter.CaseCheckResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseCheckedBean; +import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.mvp.presenter.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckedView; +import com.casic.dcms.mvp.view.ICaseCheckView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseCheckedFragment extends BaseFragment implements ICaseCheckedView { +public class CaseCheckedFragment extends BaseFragment implements ICaseCheckView { private static final String TAG = "CaseCheckedFragment"; private Context context; @@ -45,11 +45,8 @@ RecyclerView caseRecyclerView; private CaseCheckedPresenterImpl caseCheckedPresenter; private int pageIndex = 1; - private CaseCheckedResultAdapter adapter; - /** - * 临时存储网络请求到的数据 - */ - private List dataBeans = new ArrayList<>(); + private CaseCheckResultAdapter adapter; + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +63,7 @@ @Override protected void initData() { caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +84,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(pageIndex); + caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +114,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(checkedFragment.pageIndex); + checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +124,11 @@ checkedFragment.emptyView.show("您还没有已办案卷", null); } else { checkedFragment.emptyView.hide(); - checkedFragment.adapter = new CaseCheckedResultAdapter(checkedFragment.context, checkedFragment.dataBeans); + checkedFragment.adapter = new CaseCheckResultAdapter(checkedFragment.context, checkedFragment.dataBeans); checkedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(checkedFragment.context)); checkedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(checkedFragment.context, DividerItemDecoration.VERTICAL)); checkedFragment.caseRecyclerView.setAdapter(checkedFragment.adapter); - checkedFragment.adapter.setOnItemClickListener(new CaseCheckedResultAdapter.OnItemClickListener() { + checkedFragment.adapter.setOnItemClickListener(new CaseCheckResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(checkedFragment.context, CaseCheckedDetailActivity.class); @@ -146,10 +143,10 @@ } @Override - public void obtainCheckedListResult(CaseCheckedBean resultBean) { + public void obtainCheckListResult(CaseCheckBean resultBean) { // Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java index a9dd513..4409ed2 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseHandledFragment.java @@ -1,9 +1,51 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseHandledFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private static final String TAG = "DeptCaseHandledFragment"; + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptHandledListPresenterImpl handledPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +53,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handledPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseHandledFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseHandledFragment handledFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + handledFragment.isRefresh = true; + //刷新之后页码重置 + handledFragment.pageIndex = 1; + handledFragment.handledPresenter.onReadyRetrofitRequest(false, handledFragment.pageIndex); + } else if (msg.what == 2021061801) { + if (handledFragment.isRefresh || handledFragment.isLoadMore) { + handledFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (handledFragment.dataBeans.size() == 0) { + handledFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + handledFragment.emptyView.hide(); + handledFragment.adapter = new DeptHandleCaseAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); + handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); + handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); + handledFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", handledFragment.dataBeans.get(position).getId()); +// handledFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061801); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (handledPresenter != null) { + handledPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java new file mode 100644 index 0000000..70d18d9 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseProcessFragment.java @@ -0,0 +1,166 @@ +package com.casic.dcms.ui.fragment.dept; + +import android.content.Context; +import android.os.Handler; +import android.os.Message; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseProcessFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected int initLayoutView() { + return R.layout.fragment_dept_case; + } + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(false, pageIndex); + } + }); + } + + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseProcessFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseProcessFragment processFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + processFragment.isRefresh = true; + //刷新之后页码重置 + processFragment.pageIndex = 1; + processFragment.deptTodoListPresenter.onReadyRetrofitRequest(false, processFragment.pageIndex); + } else if (msg.what == 2021061802) { + if (processFragment.isRefresh || processFragment.isLoadMore) { + processFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (processFragment.dataBeans.size() == 0) { + processFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + processFragment.emptyView.hide(); + processFragment.adapter = new DeptHandleCaseAdapter(processFragment.context, processFragment.dataBeans); + processFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(processFragment.context)); + processFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(processFragment.context, DividerItemDecoration.VERTICAL)); + processFragment.caseRecyclerView.setAdapter(processFragment.adapter); + processFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(processFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", processFragment.dataBeans.get(position).getId()); +// processFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061802); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java index 1196e06..0ff25d9 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/dept/DeptCaseTodoFragment.java @@ -1,9 +1,50 @@ package com.casic.dcms.ui.fragment.dept; -import com.casic.dcms.R; -import com.casic.dcms.base.BaseFragment; +import android.content.Context; +import android.os.Handler; +import android.os.Message; -public class DeptCaseTodoFragment extends BaseFragment { +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.DeptHandleCaseAdapter; +import com.casic.dcms.base.BaseFragment; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.qmuiteam.qmui.widget.QMUIEmptyView; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; + +public class DeptCaseTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { + + private Context context; + @BindView(R.id.emptyView) + QMUIEmptyView emptyView; + @BindView(R.id.refreshLayout) + SmartRefreshLayout refreshLayout; + @BindView(R.id.caseRecyclerView) + RecyclerView caseRecyclerView; + private int pageIndex = 1; + private boolean isRefresh, isLoadMore = false; + private PkgAndDeptTodoListPresenterImpl deptTodoListPresenter; + private List dataBeans = new ArrayList<>(); + private DeptHandleCaseAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + @Override protected int initLayoutView() { return R.layout.fragment_dept_case; @@ -11,16 +52,115 @@ @Override protected void setupTopBarLayout() { - + context = getContext(); } @Override protected void initData() { + deptTodoListPresenter = new PkgAndDeptTodoListPresenterImpl(this); + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + weakReferenceHandler = new WeakReferenceHandler(this); } @Override protected void initEvent() { + refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + pageIndex = 1; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + deptTodoListPresenter.onReadyRetrofitRequest(true, pageIndex); + } + }); + } + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private WeakReference reference; + + private WeakReferenceHandler(DeptCaseTodoFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + DeptCaseTodoFragment caseTodoFragment = reference.get(); + if (msg.what == Constant.DEPT_DONE) { + caseTodoFragment.isRefresh = true; + //刷新之后页码重置 + caseTodoFragment.pageIndex = 1; + caseTodoFragment.deptTodoListPresenter.onReadyRetrofitRequest(true, caseTodoFragment.pageIndex); + } else if (msg.what == 2021061803) { + if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { + caseTodoFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (caseTodoFragment.dataBeans.size() == 0) { + caseTodoFragment.emptyView.show("您暂时没有待办案卷", null); + } else { + caseTodoFragment.emptyView.hide(); + caseTodoFragment.adapter = new DeptHandleCaseAdapter(caseTodoFragment.context, caseTodoFragment.dataBeans); + caseTodoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(caseTodoFragment.context)); + caseTodoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(caseTodoFragment.context, DividerItemDecoration.VERTICAL)); + caseTodoFragment.caseRecyclerView.setAdapter(caseTodoFragment.adapter); + caseTodoFragment.adapter.setOnItemClickListener(new DeptHandleCaseAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { +// Intent intent = new Intent(caseTodoFragment.context, PackageHandledDetailActivity.class); +// intent.putExtra("id", caseTodoFragment.dataBeans.get(position).getId()); +// caseTodoFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(2021061803); + } + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if (deptTodoListPresenter != null) { + deptTodoListPresenter.disposeRetrofitRequest(); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java index b804659..453b26b 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageHandledFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageHandledAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.mvp.presenter.PackageListHandledPresenterImpl; -import com.casic.dcms.mvp.view.IPackageLIstHandledView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptHandledListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageHandledFragment extends BaseFragment implements IPackageLIstHandledView { +public class PackageHandledFragment extends BaseFragment implements IPkgAndDeptCaseListView { private Context context; @BindView(R.id.emptyView) @@ -41,12 +42,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListHandledPresenterImpl handledPresenter; + private PkgAndDeptHandledListPresenterImpl handledPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageHandledAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -60,8 +61,8 @@ @Override protected void initData() { - handledPresenter = new PackageListHandledPresenterImpl(this); - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter = new PkgAndDeptHandledListPresenterImpl(this); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -74,7 +75,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -82,13 +83,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - handledPresenter.onReadyRetrofitRequest(pageIndex); + handledPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -111,7 +112,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.handledPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledPresenter.onReadyRetrofitRequest("1", handledFragment.pageIndex); } else if (msg.what == 2021060301) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -121,11 +122,11 @@ handledFragment.emptyView.show("您暂时没有待办案卷", null); } else { handledFragment.emptyView.hide(); - handledFragment.adapter = new PackageHandledAdapter(handledFragment.context, handledFragment.dataBeans); + handledFragment.adapter = new PackageCaseAdapter(handledFragment.context, handledFragment.dataBeans); handledFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(handledFragment.context)); handledFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(handledFragment.context, DividerItemDecoration.VERTICAL)); handledFragment.caseRecyclerView.setAdapter(handledFragment.adapter); - handledFragment.adapter.setOnItemClickListener(new PackageHandledAdapter.OnItemClickListener() { + handledFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(handledFragment.context, PackageHandledDetailActivity.class); @@ -140,9 +141,9 @@ } @Override - public void obtainPackageHandledResult(PackageHandledBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java index 56e1f61..c30e7a6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/threepkg/PackageTodoFragment.java @@ -11,11 +11,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.PackageTodoAdapter; +import com.casic.dcms.adapter.PackageCaseAdapter; import com.casic.dcms.base.BaseFragment; -import com.casic.dcms.bean.PackageTodoBean; -import com.casic.dcms.mvp.presenter.PackageListTodoPresenterImpl; -import com.casic.dcms.mvp.view.IPackageListTodoView; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; +import com.casic.dcms.mvp.presenter.PkgAndDeptTodoListPresenterImpl; +import com.casic.dcms.mvp.view.IPkgAndDeptCaseListView; import com.casic.dcms.ui.PackageTodoDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -31,7 +32,7 @@ import butterknife.BindView; -public class PackageTodoFragment extends BaseFragment implements IPackageListTodoView { +public class PackageTodoFragment extends BaseFragment implements IPkgAndDeptCaseListView { private static final String TAG = "PackageTodoFragment"; private Context context; @@ -42,12 +43,12 @@ @BindView(R.id.caseRecyclerView) RecyclerView caseRecyclerView; - private PackageListTodoPresenterImpl todoPresenter; + private PkgAndDeptTodoListPresenterImpl todoPresenter; private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; - private PackageTodoAdapter adapter; + private PackageCaseAdapter adapter; @Override protected int initLayoutView() { @@ -61,8 +62,8 @@ @Override protected void initData() { - todoPresenter = new PackageListTodoPresenterImpl(this); - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter = new PkgAndDeptTodoListPresenterImpl(this); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -75,7 +76,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -83,13 +84,13 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - todoPresenter.onReadyRetrofitRequest(pageIndex); + todoPresenter.onReadyRetrofitRequest("1", pageIndex); } }); } /** - * 供{@link com.casic.dcms.ui}调用 + * 供{@link com.casic.dcms.ui.PackageTodoDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { @@ -112,7 +113,7 @@ todoFragment.isRefresh = true; //刷新之后页码重置 todoFragment.pageIndex = 1; - todoFragment.todoPresenter.onReadyRetrofitRequest(todoFragment.pageIndex); + todoFragment.todoPresenter.onReadyRetrofitRequest("1", todoFragment.pageIndex); } else if (msg.what == 2021060302) { if (todoFragment.isRefresh || todoFragment.isLoadMore) { todoFragment.adapter.notifyDataSetChanged(); @@ -122,11 +123,11 @@ todoFragment.emptyView.show("您暂时没有待办案卷", null); } else { todoFragment.emptyView.hide(); - todoFragment.adapter = new PackageTodoAdapter(todoFragment.context, todoFragment.dataBeans); + todoFragment.adapter = new PackageCaseAdapter(todoFragment.context, todoFragment.dataBeans); todoFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(todoFragment.context)); todoFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(todoFragment.context, DividerItemDecoration.VERTICAL)); todoFragment.caseRecyclerView.setAdapter(todoFragment.adapter); - todoFragment.adapter.setOnItemClickListener(new PackageTodoAdapter.OnItemClickListener() { + todoFragment.adapter.setOnItemClickListener(new PackageCaseAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(todoFragment.context, PackageTodoDetailActivity.class); @@ -141,9 +142,9 @@ } @Override - public void obtainPackageTodoResult(PackageTodoBean resultBean) { + public void obtainPackageCaseResult(PkgAndDeptHandleBean resultBean) { if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index d755dd9..b65c45f 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.casic.dcms.R; -import com.casic.dcms.adapter.CaseVerifiedResultAdapter; +import com.casic.dcms.adapter.CaseVerifyResultAdapter; import com.casic.dcms.base.BaseFragment; import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseVerifiedBean; +import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.mvp.presenter.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifiedView; +import com.casic.dcms.mvp.view.ICaseVerifyView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -33,7 +33,7 @@ import butterknife.BindView; -public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifiedView { +public class CaseVerifiedFragment extends BaseFragment implements ICaseVerifyView { private static final String TAG = "CaseHandledFragment"; private Context context; @@ -45,11 +45,11 @@ RecyclerView caseRecyclerView; private CaseVerifiedPresenterImpl caseVerifiedPresenter; private int pageIndex = 1; - private CaseVerifiedResultAdapter adapter; + private CaseVerifyResultAdapter adapter; /** * 临时存储网络请求到的数据 */ - private List dataBeans = new ArrayList<>(); + private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; private static WeakReferenceHandler weakReferenceHandler; @@ -66,7 +66,7 @@ @Override protected void initData() { caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -79,7 +79,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -87,7 +87,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(pageIndex); + caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); } }); } @@ -117,7 +117,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(verifiedFragment.pageIndex); + verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -127,11 +127,11 @@ verifiedFragment.emptyView.show("您还没有已办案卷", null); } else { verifiedFragment.emptyView.hide(); - verifiedFragment.adapter = new CaseVerifiedResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); + verifiedFragment.adapter = new CaseVerifyResultAdapter(verifiedFragment.context, verifiedFragment.dataBeans); verifiedFragment.caseRecyclerView.setLayoutManager(new LinearLayoutManager(verifiedFragment.context)); verifiedFragment.caseRecyclerView.addItemDecoration(new DividerItemDecoration(verifiedFragment.context, DividerItemDecoration.VERTICAL)); verifiedFragment.caseRecyclerView.setAdapter(verifiedFragment.adapter); - verifiedFragment.adapter.setOnItemClickListener(new CaseVerifiedResultAdapter.OnItemClickListener() { + verifiedFragment.adapter.setOnItemClickListener(new CaseVerifyResultAdapter.OnItemClickListener() { @Override public void onClick(int position) { Intent intent = new Intent(verifiedFragment.context, CaseVerifiedDetailActivity.class); @@ -146,10 +146,10 @@ } @Override - public void obtainVerifiedListResult(CaseVerifiedBean resultBean) { + public void obtainVerifyListResult(CaseVerifyBean resultBean) { // Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 dataBeans = dataRows; diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index e664e81..b9bedb4 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -15,7 +15,7 @@ Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CALL_PHONE, Manifest.permission.READ_PHONE_STATE}; public static final String[] CASE_PAGE_TITLES = {"待办案卷", "已办案卷"}; - public static final String[] DEPT_PAGE_TITLES = {"待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; + public static final String[] DEPT_PAGE_TITLES = {"待办任务", "待处理", "部门授权审核", "部门调整批示", "二级缓办待处理", "二级延期待处理", "已办案卷"}; public static final String[] CHART_PAGE_TITLES = {"表格", "饼状图"}; public static final List ANALYSIS_ICONS = Arrays.asList( @@ -62,6 +62,7 @@ public static final int UPLOAD_LOCATION = 20; public static final int MESSAGE_NUMBER = 21; public static final int PACKAGE_DONE = 22; + public static final int DEPT_DONE = 23; public static final double DEFAULT_LNG = 116.06639658728571; public static final double DEFAULT_LAT = 27.759547805536418; diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 4063d6a..eba27bd 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -2,7 +2,6 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.bean.CaseCheckedBean; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; @@ -12,7 +11,6 @@ import com.casic.dcms.bean.CaseProcessBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.CaseStatusBean; -import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.bean.CommonSentenceBean; @@ -24,9 +22,8 @@ import com.casic.dcms.bean.NewVersionBean; import com.casic.dcms.bean.OnlinePersonBean; import com.casic.dcms.bean.OvertimeCaseBean; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PackageTodoBean; import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.bean.UserBean; @@ -240,9 +237,9 @@ * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable obtainCaseVerifiedList(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 @@ -256,9 +253,9 @@ * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable obtainCaseCheckedList(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 上传案卷图片 @@ -485,23 +482,53 @@ * http://111.198.10.15:11409/case/workListPage?isShop=1 */ @GET("/case/workListPage") - Observable obtainWorkListPage(@Header("token") String token, - @Query("isShop") String isShop, - @Query("limit") int limit, - @Query("offset") int offset); + Observable obtainWorkListPage(@Header("token") String token, + @Query("isShop") String isShop, + @Query("limit") int limit, + @Query("offset") int offset); /** * 三包已办 *

- * http://111.198.10.15:11409/case/completedListPage?isShop=1 + * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15&isShop=1 */ @GET("/case/completedListPage") - Observable obtainCompletedListPage(@Header("token") String token, - @Query("isShop") String isShop, + Observable obtainCompletedListPage(@Header("token") String token, + @Query("isShop") String isShop, + @Query("limit") int limit, + @Query("offset") int offset); + + /** + * 二级派遣员待办任务 + *

+ * http://111.198.10.15:11409/case/workListPage?offset=1&limit=15 + */ + @GET("/case/workListPage") + Observable obtainWorkListPage(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); + + /** + * 二级派遣员待处理案卷 + *

+ * http://111.198.10.15:11409/case/toProcessListPage/?offset=1&limit=15 + */ + @GET("/case/toProcessListPage") + Observable obtainProcessListPage(@Header("token") String token, @Query("limit") int limit, @Query("offset") int offset); /** + * 二级派遣员已办案卷 + *

+ * http://111.198.10.15:11409/case/completedListPage/?offset=1&limit=15 + */ + @GET("/case/completedListPage") + Observable obtainCompletedListPage(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); + + /** * 三包处罚 *

* http://111.198.10.15:11409/case/update diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 080cb61..89472de 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -4,7 +4,6 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.bean.CaseCheckedBean; import com.casic.dcms.bean.CaseDetailBean; import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; @@ -14,7 +13,6 @@ import com.casic.dcms.bean.CaseProcessBean; import com.casic.dcms.bean.CaseSmallClassBean; import com.casic.dcms.bean.CaseStatusBean; -import com.casic.dcms.bean.CaseVerifiedBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.bean.CommonSentenceBean; @@ -26,9 +24,8 @@ import com.casic.dcms.bean.NewVersionBean; import com.casic.dcms.bean.OnlinePersonBean; import com.casic.dcms.bean.OvertimeCaseBean; -import com.casic.dcms.bean.PackageHandledBean; -import com.casic.dcms.bean.PackageTodoBean; import com.casic.dcms.bean.PhoneBookBean; +import com.casic.dcms.bean.PkgAndDeptHandleBean; import com.casic.dcms.bean.PublicKeyBean; import com.casic.dcms.bean.UrgentCaseBean; import com.casic.dcms.bean.UserBean; @@ -141,9 +138,10 @@ int bzhours, int bzminis) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, latitude, - source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, communityCode, - gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, bzhours, bzminis); + return service.submitCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, + latitude, source, caseLevel, eorc, casetypeCode, casetypeDetailCode, areaCode, streetCode, + communityCode, gridId, description, fieldintro, fileIdVerify, audioIdVerify, videoIdVerify, + bzhours, bzminis); } /** @@ -218,8 +216,8 @@ String isShopCase, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseList(AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, caseState, - registerTimeBegin, registerTimeEnd, isShopCase, 15, offset); + return service.obtainCaseList(AuthenticationHelper.getToken(), eorc, casetypeCode, casetypeDetailCode, + caseState, registerTimeBegin, registerTimeEnd, isShopCase, Constant.PAGE_LIMIT, offset); } /** @@ -261,10 +259,10 @@ /** * 获取核实已办案卷 */ - public static Observable getCaseVerifiedListResult(int offset) { + public static Observable getCaseVerifiedListResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), 15, offset); + return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), limit, offset); } /** @@ -279,10 +277,10 @@ /** * 获取核查已办案卷 */ - public static Observable getCaseCheckedListResult(int offset) { + public static Observable getCaseCheckedListResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), 15, offset); + return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), limit, offset); } /** @@ -335,9 +333,9 @@ String shopkeeperName, String shopPhone) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.submitShopCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, longitude, - latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, description, - fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); + return service.submitShopCase(AuthenticationHelper.getToken(), isNeedVerify, isNeedRevisit, + longitude, latitude, source, caseLevel, areaCode, streetCode, communityCode, gridId, + description, fieldintro, fileIdVerify, bzhours, bzminis, shopId, shopkeeperName, shopPhone); } /** @@ -347,7 +345,8 @@ int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainHandleCase(AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset); + return service.obtainHandleCase(AuthenticationHelper.getToken(), isOvertime, isEmergent, + "0", limit, offset); } /** @@ -356,7 +355,7 @@ public static Observable getCaseHandledListResult(int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainHandledCase(AuthenticationHelper.getToken(), 15, offset); + return service.obtainHandledCase(AuthenticationHelper.getToken(), Constant.PAGE_LIMIT, offset); } /** @@ -365,7 +364,8 @@ public static Observable getUrgentCaseListResult(String isSupervise, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainUrgentCase(AuthenticationHelper.getToken(), isSupervise, 15, offset); + return service.obtainUrgentCase(AuthenticationHelper.getToken(), isSupervise, + Constant.PAGE_LIMIT, offset); } /** @@ -374,7 +374,8 @@ public static Observable getOvertimeCaseListResult(String isSupervise, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainOvertimeCase(AuthenticationHelper.getToken(), isSupervise, 15, offset); + return service.obtainOvertimeCase(AuthenticationHelper.getToken(), isSupervise, + Constant.PAGE_LIMIT, offset); } /** @@ -425,7 +426,8 @@ String remarks, String fileId) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.handleCase(AuthenticationHelper.getToken(), processId, bizId, currState, changeState, remarks, fileId); + return service.handleCase(AuthenticationHelper.getToken(), processId, bizId, currState, + changeState, remarks, fileId); } /** @@ -439,8 +441,8 @@ String approvalResult) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.handleCase(AuthenticationHelper.getToken(), processId, bizId, currState, changeState, remarks, - fileId, approvalResult); + return service.handleCase(AuthenticationHelper.getToken(), processId, bizId, currState, + changeState, remarks, fileId, approvalResult); } /** @@ -460,9 +462,9 @@ String fieldintro) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.handleCase(AuthenticationHelper.getToken(), processId, bizId, currState, changeState, - remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, caseLevel, areaCode, - streetCode, communityCode, gridId, fieldintro); + return service.handleCase(AuthenticationHelper.getToken(), processId, bizId, currState, + changeState, remarks, fileId, eorc, casetypeCode, casetypeDetailCode, lng, lat, + caseLevel, areaCode, streetCode, communityCode, gridId, fieldintro); } /** @@ -501,8 +503,8 @@ String workContent) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.cleanToilet(AuthenticationHelper.getToken(), toiletId, userId, lng, lat, cleanTime, - photo, workContent); + return service.cleanToilet(AuthenticationHelper.getToken(), toiletId, userId, lng, lat, + cleanTime, photo, workContent); } /** @@ -513,26 +515,58 @@ int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainToiletCleanRecord(AuthenticationHelper.getToken(), userId, keywords, beginDate, - endDate, 15, offset); + return service.obtainToiletCleanRecord(AuthenticationHelper.getToken(), userId, keywords, + beginDate, endDate, Constant.PAGE_LIMIT, offset); } /** * 三包待办 */ - public static Observable getWorkListResult(int offset) { + public static Observable getWorkListResult(String isShop, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainWorkListPage(AuthenticationHelper.getToken(), "1", 15, offset); + return service.obtainWorkListPage(AuthenticationHelper.getToken(), isShop, + Constant.PAGE_LIMIT, offset); } /** * 三包已办 */ - public static Observable getCompletedListResult(int offset) { + public static Observable getCompletedListResult(String isShop, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCompletedListPage(AuthenticationHelper.getToken(), "1", 15, offset); + return service.obtainCompletedListPage(AuthenticationHelper.getToken(), isShop, + Constant.PAGE_LIMIT, offset); + } + + /** + * 二级派遣员待办任务 + */ + public static Observable getWorkListResult(int offset) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.obtainWorkListPage(AuthenticationHelper.getToken(), + Constant.PAGE_LIMIT, offset); + } + + /** + * 二级派遣员待办案卷 + */ + public static Observable getProcessListResult(int offset) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.obtainProcessListPage(AuthenticationHelper.getToken(), + Constant.PAGE_LIMIT, offset); + } + + /** + * 二级派遣员已办案卷 + */ + public static Observable getCompletedListResult(int offset) { + Retrofit retrofit = createRetrofit(); + RetrofitService service = retrofit.create(RetrofitService.class); + return service.obtainCompletedListPage(AuthenticationHelper.getToken(), + Constant.PAGE_LIMIT, offset); } /** @@ -555,7 +589,7 @@ String images) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.changeShopInfo(AuthenticationHelper.getToken(), merchantId, "1", merchantName, - contactName, contactPhone, images, "1"); + return service.changeShopInfo(AuthenticationHelper.getToken(), merchantId, "1", + merchantName, contactName, contactPhone, images, "1"); } }