Commit 85080083 by liru

统计表一修改

parent 9bd3ad62
...@@ -65,9 +65,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr ...@@ -65,9 +65,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
tmpResult = qiquMap.get(orhonFgqy.getDeptId()); tmpResult = qiquMap.get(orhonFgqy.getDeptId());
} }
tmpResult.setDwl(tmpResult.getDwl() + 1); tmpResult.setDwl(tmpResult.getDwl() + 1);
if ( orhonFgqy.getType().equals("1")) { if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("1")) {
tmpResult.setGmysfgqy(tmpResult.getGmysfgqy() + 1); tmpResult.setGmysfgqy(tmpResult.getGmysfgqy() + 1);
} else if ( orhonFgqy.getType().equals("2")) { } else if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("2")) {
tmpResult.setGmyxfgqy(tmpResult.getGmyxfgqy() + 1); tmpResult.setGmyxfgqy(tmpResult.getGmyxfgqy() + 1);
} }
...@@ -135,6 +135,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr ...@@ -135,6 +135,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size()); List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size());
for (SysDictData dictData : areaList) { for (SysDictData dictData : areaList) {
ReportOneResult result = qiquMap.get(Long.parseLong(dictData.getDictValue())); ReportOneResult result = qiquMap.get(Long.parseLong(dictData.getDictValue()));
if(result == null){
result = new ReportOneResult();
this.initResult(result);
}
result.setAreaName(dictData.getDictLabel()); result.setAreaName(dictData.getDictLabel());
reportOneResultList.add(result); reportOneResultList.add(result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment