|
@@ -421,8 +421,8 @@ public class KaoQinController extends BaseController {
|
|
|
Long zt= 0L;
|
|
|
|
|
|
Long qk= 0L;
|
|
|
-
|
|
|
- Long count = 0L;
|
|
|
+
|
|
|
+ Long count = Long.valueOf(kaoQinRecords.size());
|
|
|
SysDictData dictData = new SysDictData();
|
|
|
dictData.setDictType("kaoqin_abnormal");
|
|
|
List<SysDictData> sysDictData = dictDataService.selectDictDataList(dictData);
|
|
@@ -442,25 +442,21 @@ public class KaoQinController extends BaseController {
|
|
|
if (StringUtils.isNotBlank(kaTypeAmIn)) {
|
|
|
Long aLong = todayMap.get(kaTypeAmIn);
|
|
|
todayMap.put(kaTypeAmIn, aLong + 1);
|
|
|
- count = count + 1;
|
|
|
}
|
|
|
|
|
|
if("4".equals(kaoqinConfigDept.getKaNum())){
|
|
|
if (StringUtils.isNotBlank(kaTypeAmOut)) {
|
|
|
Long aLong = todayMap.get(kaTypeAmOut);
|
|
|
todayMap.put(kaTypeAmOut, aLong + 1);
|
|
|
- count = count + 1;
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(kaTypePmIn)) {
|
|
|
Long aLong = todayMap.get(kaTypePmIn);
|
|
|
todayMap.put(kaTypePmIn, aLong + 1);
|
|
|
- count = count + 1;
|
|
|
}
|
|
|
}
|
|
|
if (StringUtils.isNotBlank(kaTypePmOut)) {
|
|
|
Long aLong = todayMap.get(kaTypePmOut);
|
|
|
todayMap.put(kaTypePmOut, aLong + 1);
|
|
|
- count = count + 1;
|
|
|
}
|
|
|
}
|
|
|
zc = todayMap.get("1");
|
|
@@ -469,6 +465,7 @@ public class KaoQinController extends BaseController {
|
|
|
zt = todayMap.get("4");
|
|
|
qk = todayMap.get("5");
|
|
|
|
|
|
+ map.put("zs",count);
|
|
|
map.put("zc",zc);
|
|
|
map.put("wq",wq);
|
|
|
map.put("cd",cd);
|