diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index 6151859..1dd17f0 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -145,8 +145,8 @@ }); BarData barData = new BarData(totalCheckBarDataSet, checkedBarDataSet); - barData.setBarWidth(0.5f); - barData.groupBars(0f, 0.5f, 0); + barData.setBarWidth(0.3f); + barData.groupBars(0f, 0.2f, 0); chart.setData(barData); chart.invalidate(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index 6151859..1dd17f0 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -145,8 +145,8 @@ }); BarData barData = new BarData(totalCheckBarDataSet, checkedBarDataSet); - barData.setBarWidth(0.5f); - barData.groupBars(0f, 0.5f, 0); + barData.setBarWidth(0.3f); + barData.groupBars(0f, 0.2f, 0); chart.setData(barData); chart.invalidate(); } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index eb271d5..440648b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -10,7 +10,6 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; -import com.casic.dcms.utils.CaseResourceComparator; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.ColorHub; import com.casic.dcms.utils.DialogHub; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -150,4 +150,14 @@ } }); } + + private static class CaseResourceComparator implements Comparator { + + @Override + public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { + int i = Integer.parseInt(o1.getCaseNum()); + int j = Integer.parseInt(o2.getCaseNum()); + return j - i; + } + } } diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index 6151859..1dd17f0 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -145,8 +145,8 @@ }); BarData barData = new BarData(totalCheckBarDataSet, checkedBarDataSet); - barData.setBarWidth(0.5f); - barData.groupBars(0f, 0.5f, 0); + barData.setBarWidth(0.3f); + barData.groupBars(0f, 0.2f, 0); chart.setData(barData); chart.invalidate(); } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index eb271d5..440648b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -10,7 +10,6 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; -import com.casic.dcms.utils.CaseResourceComparator; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.ColorHub; import com.casic.dcms.utils.DialogHub; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -150,4 +150,14 @@ } }); } + + private static class CaseResourceComparator implements Comparator { + + @Override + public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { + int i = Integer.parseInt(o1.getCaseNum()); + int j = Integer.parseInt(o2.getCaseNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index 62f246d..8ca8973 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -30,6 +30,8 @@ import com.pengxh.androidx.lite.vm.LoadState; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -76,26 +78,29 @@ if (conditionBean.getCode() == 200) { int caseCount = 0; List dataModels = conditionBean.getData(); - List totalCheckBars = new ArrayList<>(); - List checkedBars = new ArrayList<>(); + List totalCheckBars = new ArrayList<>();//派发 + List checkBars = new ArrayList<>();//处置数 List effectiveModels = new ArrayList<>(); for (int i = 0; i < dataModels.size(); i++) { DeptHandleConditionBean.DataModel dataModel = dataModels.get(i); if (!dataModel.getDepartName().equals("合计")) { effectiveModels.add(dataModel); - caseCount += Integer.parseInt(dataModel.getTotalCheckNum()); - totalCheckBars.add(new BarEntry(i, Integer.parseInt(dataModel.getTotalCheckNum()))); - checkedBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + checkBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + } else { + caseCount = Integer.parseInt(dataModel.getTotalCheckNum()); } } viewBinding.caseCountView.setText("案卷数：" + caseCount); - ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkedBars); + ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkBars); + + //按数量排序 + Collections.sort(effectiveModels, new DeptHandleConditionComparator()); //绑定列表 - NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_resource_lv_l, effectiveModels) { + NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_dept_handle_lv_l, effectiveModels) { @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 @@ -105,7 +110,8 @@ .setBackgroundColor(R.id.numberTagView, color[0]) .setTextColor(R.id.numberTagView, color[1]) .setText(R.id.caseSourceView, item.getDepartName()) - .setText(R.id.caseNumView, item.getTotalCheckNum()); + .setText(R.id.caseTotalNumView, item.getTotalCheckNum()) + .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; viewBinding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); @@ -149,4 +155,14 @@ } }); } + + private static class DeptHandleConditionComparator implements Comparator { + + @Override + public int compare(DeptHandleConditionBean.DataModel o1, DeptHandleConditionBean.DataModel o2) { + int i = Integer.parseInt(o1.getTotalCheckNum()); + int j = Integer.parseInt(o2.getTotalCheckNum()); + return j - i; + } + } } diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index 6151859..1dd17f0 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -145,8 +145,8 @@ }); BarData barData = new BarData(totalCheckBarDataSet, checkedBarDataSet); - barData.setBarWidth(0.5f); - barData.groupBars(0f, 0.5f, 0); + barData.setBarWidth(0.3f); + barData.groupBars(0f, 0.2f, 0); chart.setData(barData); chart.invalidate(); } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index eb271d5..440648b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -10,7 +10,6 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; -import com.casic.dcms.utils.CaseResourceComparator; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.ColorHub; import com.casic.dcms.utils.DialogHub; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -150,4 +150,14 @@ } }); } + + private static class CaseResourceComparator implements Comparator { + + @Override + public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { + int i = Integer.parseInt(o1.getCaseNum()); + int j = Integer.parseInt(o2.getCaseNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index 62f246d..8ca8973 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -30,6 +30,8 @@ import com.pengxh.androidx.lite.vm.LoadState; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -76,26 +78,29 @@ if (conditionBean.getCode() == 200) { int caseCount = 0; List dataModels = conditionBean.getData(); - List totalCheckBars = new ArrayList<>(); - List checkedBars = new ArrayList<>(); + List totalCheckBars = new ArrayList<>();//派发 + List checkBars = new ArrayList<>();//处置数 List effectiveModels = new ArrayList<>(); for (int i = 0; i < dataModels.size(); i++) { DeptHandleConditionBean.DataModel dataModel = dataModels.get(i); if (!dataModel.getDepartName().equals("合计")) { effectiveModels.add(dataModel); - caseCount += Integer.parseInt(dataModel.getTotalCheckNum()); - totalCheckBars.add(new BarEntry(i, Integer.parseInt(dataModel.getTotalCheckNum()))); - checkedBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + checkBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + } else { + caseCount = Integer.parseInt(dataModel.getTotalCheckNum()); } } viewBinding.caseCountView.setText("案卷数：" + caseCount); - ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkedBars); + ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkBars); + + //按数量排序 + Collections.sort(effectiveModels, new DeptHandleConditionComparator()); //绑定列表 - NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_resource_lv_l, effectiveModels) { + NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_dept_handle_lv_l, effectiveModels) { @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 @@ -105,7 +110,8 @@ .setBackgroundColor(R.id.numberTagView, color[0]) .setTextColor(R.id.numberTagView, color[1]) .setText(R.id.caseSourceView, item.getDepartName()) - .setText(R.id.caseNumView, item.getTotalCheckNum()); + .setText(R.id.caseTotalNumView, item.getTotalCheckNum()) + .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; viewBinding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); @@ -149,4 +155,14 @@ } }); } + + private static class DeptHandleConditionComparator implements Comparator { + + @Override + public int compare(DeptHandleConditionBean.DataModel o1, DeptHandleConditionBean.DataModel o2) { + int i = Integer.parseInt(o1.getTotalCheckNum()); + int j = Integer.parseInt(o2.getTotalCheckNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 5f36857..fc62614 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -188,7 +188,7 @@ } //内部类 - static class RegroupHighEventBean { + private static class RegroupHighEventBean { private String caseMajorType; private int caseNum; @@ -209,7 +209,7 @@ } } - static class RegroupHighEventComparator implements Comparator { + private static class RegroupHighEventComparator implements Comparator { @Override public int compare(RegroupHighEventBean o1, RegroupHighEventBean o2) { int i = o1.getCaseNum(); diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index 6151859..1dd17f0 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -145,8 +145,8 @@ }); BarData barData = new BarData(totalCheckBarDataSet, checkedBarDataSet); - barData.setBarWidth(0.5f); - barData.groupBars(0f, 0.5f, 0); + barData.setBarWidth(0.3f); + barData.groupBars(0f, 0.2f, 0); chart.setData(barData); chart.invalidate(); } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index eb271d5..440648b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -10,7 +10,6 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; -import com.casic.dcms.utils.CaseResourceComparator; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.ColorHub; import com.casic.dcms.utils.DialogHub; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -150,4 +150,14 @@ } }); } + + private static class CaseResourceComparator implements Comparator { + + @Override + public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { + int i = Integer.parseInt(o1.getCaseNum()); + int j = Integer.parseInt(o2.getCaseNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index 62f246d..8ca8973 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -30,6 +30,8 @@ import com.pengxh.androidx.lite.vm.LoadState; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -76,26 +78,29 @@ if (conditionBean.getCode() == 200) { int caseCount = 0; List dataModels = conditionBean.getData(); - List totalCheckBars = new ArrayList<>(); - List checkedBars = new ArrayList<>(); + List totalCheckBars = new ArrayList<>();//派发 + List checkBars = new ArrayList<>();//处置数 List effectiveModels = new ArrayList<>(); for (int i = 0; i < dataModels.size(); i++) { DeptHandleConditionBean.DataModel dataModel = dataModels.get(i); if (!dataModel.getDepartName().equals("合计")) { effectiveModels.add(dataModel); - caseCount += Integer.parseInt(dataModel.getTotalCheckNum()); - totalCheckBars.add(new BarEntry(i, Integer.parseInt(dataModel.getTotalCheckNum()))); - checkedBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + checkBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + } else { + caseCount = Integer.parseInt(dataModel.getTotalCheckNum()); } } viewBinding.caseCountView.setText("案卷数：" + caseCount); - ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkedBars); + ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkBars); + + //按数量排序 + Collections.sort(effectiveModels, new DeptHandleConditionComparator()); //绑定列表 - NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_resource_lv_l, effectiveModels) { + NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_dept_handle_lv_l, effectiveModels) { @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 @@ -105,7 +110,8 @@ .setBackgroundColor(R.id.numberTagView, color[0]) .setTextColor(R.id.numberTagView, color[1]) .setText(R.id.caseSourceView, item.getDepartName()) - .setText(R.id.caseNumView, item.getTotalCheckNum()); + .setText(R.id.caseTotalNumView, item.getTotalCheckNum()) + .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; viewBinding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); @@ -149,4 +155,14 @@ } }); } + + private static class DeptHandleConditionComparator implements Comparator { + + @Override + public int compare(DeptHandleConditionBean.DataModel o1, DeptHandleConditionBean.DataModel o2) { + int i = Integer.parseInt(o1.getTotalCheckNum()); + int j = Integer.parseInt(o2.getTotalCheckNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 5f36857..fc62614 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -188,7 +188,7 @@ } //内部类 - static class RegroupHighEventBean { + private static class RegroupHighEventBean { private String caseMajorType; private int caseNum; @@ -209,7 +209,7 @@ } } - static class RegroupHighEventComparator implements Comparator { + private static class RegroupHighEventComparator implements Comparator { @Override public int compare(RegroupHighEventBean o1, RegroupHighEventBean o2) { int i = o1.getCaseNum(); diff --git a/app/src/main/res/layout/item_case_dept_handle_lv_l.xml b/app/src/main/res/layout/item_case_dept_handle_lv_l.xml new file mode 100644 index 0000000..c81d7ef --- /dev/null +++ b/app/src/main/res/layout/item_case_dept_handle_lv_l.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index e4cdbe0..562ec11 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -317,6 +317,8 @@ + + diff --git a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java b/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java deleted file mode 100644 index 5484b4b..0000000 --- a/app/src/main/java/com/casic/dcms/utils/CaseResourceComparator.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.dcms.utils; - -import com.casic.dcms.model.CaseResourceBean; - -import java.util.Comparator; - -public class CaseResourceComparator implements Comparator { - - @Override - public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { - int i = Integer.parseInt(o1.getCaseNum()); - int j = Integer.parseInt(o2.getCaseNum()); - return j - i; - } -} diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index 6151859..1dd17f0 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -145,8 +145,8 @@ }); BarData barData = new BarData(totalCheckBarDataSet, checkedBarDataSet); - barData.setBarWidth(0.5f); - barData.groupBars(0f, 0.5f, 0); + barData.setBarWidth(0.3f); + barData.groupBars(0f, 0.2f, 0); chart.setData(barData); chart.invalidate(); } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java index eb271d5..440648b 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/CaseResourceActivity.java @@ -10,7 +10,6 @@ import com.casic.dcms.R; import com.casic.dcms.databinding.ActivityCaseResourceBinding; import com.casic.dcms.model.CaseResourceBean; -import com.casic.dcms.utils.CaseResourceComparator; import com.casic.dcms.utils.ChartViewHelper; import com.casic.dcms.utils.ColorHub; import com.casic.dcms.utils.DialogHub; @@ -32,6 +31,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -150,4 +150,14 @@ } }); } + + private static class CaseResourceComparator implements Comparator { + + @Override + public int compare(CaseResourceBean.DataModel o1, CaseResourceBean.DataModel o2) { + int i = Integer.parseInt(o1.getCaseNum()); + int j = Integer.parseInt(o2.getCaseNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java index 62f246d..8ca8973 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DeptHandleConditionActivity.java @@ -30,6 +30,8 @@ import com.pengxh.androidx.lite.vm.LoadState; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; /** @@ -76,26 +78,29 @@ if (conditionBean.getCode() == 200) { int caseCount = 0; List dataModels = conditionBean.getData(); - List totalCheckBars = new ArrayList<>(); - List checkedBars = new ArrayList<>(); + List totalCheckBars = new ArrayList<>();//派发 + List checkBars = new ArrayList<>();//处置数 List effectiveModels = new ArrayList<>(); for (int i = 0; i < dataModels.size(); i++) { DeptHandleConditionBean.DataModel dataModel = dataModels.get(i); if (!dataModel.getDepartName().equals("合计")) { effectiveModels.add(dataModel); - caseCount += Integer.parseInt(dataModel.getTotalCheckNum()); - totalCheckBars.add(new BarEntry(i, Integer.parseInt(dataModel.getTotalCheckNum()))); - checkedBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + checkBars.add(new BarEntry(i, Integer.parseInt(dataModel.getCheckedNum()))); + } else { + caseCount = Integer.parseInt(dataModel.getTotalCheckNum()); } } viewBinding.caseCountView.setText("案卷数：" + caseCount); - ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkedBars); + ChartViewHelper.setBarChartData(viewBinding.horizontalBarChart, totalCheckBars, checkBars); + + //按数量排序 + Collections.sort(effectiveModels, new DeptHandleConditionComparator()); //绑定列表 - NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_resource_lv_l, effectiveModels) { + NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_case_dept_handle_lv_l, effectiveModels) { @Override public void convertView(ViewHolder viewHolder, int position, DeptHandleConditionBean.DataModel item) { //设置随机颜色 @@ -105,7 +110,8 @@ .setBackgroundColor(R.id.numberTagView, color[0]) .setTextColor(R.id.numberTagView, color[1]) .setText(R.id.caseSourceView, item.getDepartName()) - .setText(R.id.caseNumView, item.getTotalCheckNum()); + .setText(R.id.caseTotalNumView, item.getTotalCheckNum()) + .setText(R.id.caseCheckedNumView, item.getCheckedNum()); } }; viewBinding.deptHandleView.addItemDecoration(new ItemDecoration(FloatHub.dp2px(context, 75), FloatHub.dp2px(context, 15))); @@ -149,4 +155,14 @@ } }); } + + private static class DeptHandleConditionComparator implements Comparator { + + @Override + public int compare(DeptHandleConditionBean.DataModel o1, DeptHandleConditionBean.DataModel o2) { + int i = Integer.parseInt(o1.getTotalCheckNum()); + int j = Integer.parseInt(o2.getTotalCheckNum()); + return j - i; + } + } } diff --git a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java index 5f36857..fc62614 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/HighEventActivity.java @@ -188,7 +188,7 @@ } //内部类 - static class RegroupHighEventBean { + private static class RegroupHighEventBean { private String caseMajorType; private int caseNum; @@ -209,7 +209,7 @@ } } - static class RegroupHighEventComparator implements Comparator { + private static class RegroupHighEventComparator implements Comparator { @Override public int compare(RegroupHighEventBean o1, RegroupHighEventBean o2) { int i = o1.getCaseNum(); diff --git a/app/src/main/res/layout/item_case_dept_handle_lv_l.xml b/app/src/main/res/layout/item_case_dept_handle_lv_l.xml new file mode 100644 index 0000000..c81d7ef --- /dev/null +++ b/app/src/main/res/layout/item_case_dept_handle_lv_l.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 3cc24c1..bfbfc7a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -44,7 +44,7 @@ 46dp - 230dp + 255dp 48px