Skip to content

A
amos-boot-biz
Commit b5510e23 authored by tianyiming's avatar tianyiming
Browse files
Options

修改一码通总览某大类数据未查到不显示的问题

parent 5bf50b1b
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 12 deletions
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ b5510e23
...@@ -138,13 +138,14 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD ...@@ -138,13 +138,14 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
for (Map<String, Object> map : mapList) { for (Map<String, Object> map : mapList) {
for (Map<String, Object> map1 : listMap) { for (Map<String, Object> map1 : listMap) {
if (map.get("code").equals(map1.get("category"))) { if (map.get("code").equals(map1.get("category"))) {
map1.put("name", map.get("name")); map.put("waitClaim", map1.get("waitClaim"));
map1.put("image", map.get("image")); map.put("alreadyClaim", map1.get("alreadyClaim"));
map.put("refuseClaim", map1.get("refuseClaim"));
Long sum = Long.valueOf(map1.get("waitClaim").toString()) + Long.valueOf(map1.get("alreadyClaim").toString()) + Long.valueOf(map1.get("refuseClaim").toString()); Long sum = Long.valueOf(map1.get("waitClaim").toString()) + Long.valueOf(map1.get("alreadyClaim").toString()) + Long.valueOf(map1.get("refuseClaim").toString());
map1.put("sum", sum); map.put("sum", sum);
list.add(map1);
} }
} }
list.add(map);
} }
page.setCurrent(1); page.setCurrent(1);
page.setTotal(list.size()); page.setTotal(list.size());
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/equipCategory.json
View file @ b5510e23
...@@ -3,42 +3,74 @@ ...@@ -3,42 +3,74 @@
{ {
"name": "电梯", "name": "电梯",
"code": "3000", "code": "3000",
"image": "upload/tzs/common/image/总览电梯.png" "image": "upload/tzs/common/image/总览电梯.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "起重机械", "name": "起重机械",
"code": "4000", "code": "4000",
"image": "upload/tzs/common/image/总览起重机械.png" "image": "upload/tzs/common/image/总览起重机械.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "场内机动车辆", "name": "场内机动车辆",
"code": "5000", "code": "5000",
"image": "upload/tzs/common/image/总览厂车.png" "image": "upload/tzs/common/image/总览厂车.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "锅炉", "name": "锅炉",
"code": "1000", "code": "1000",
"image": "upload/tzs/common/image/总览锅炉.png" "image": "upload/tzs/common/image/总览锅炉.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "压力容器", "name": "压力容器",
"code": "2000", "code": "2000",
"image": "upload/tzs/common/image/总览压力容器.png" "image": "upload/tzs/common/image/总览压力容器.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "压力管道", "name": "压力管道",
"code": "8000", "code": "8000",
"image": "upload/tzs/common/image/总览压力管道.png" "image": "upload/tzs/common/image/总览压力管道.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "大型游乐设施", "name": "大型游乐设施",
"code": "6000", "code": "6000",
"image": "upload/tzs/common/image/总览游乐设施.png" "image": "upload/tzs/common/image/总览游乐设施.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
}, },
{ {
"name": "客运索道", "name": "客运索道",
"code": "9000", "code": "9000",
"image": "upload/tzs/common/image/总览索道.png" "image": "upload/tzs/common/image/总览索道.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0"
} }
], ],
"other": [ "other": [
......
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