Skip to content

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

八大类总览完善

parent 748332ed
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 44 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml
View file @ c038d5f3
...@@ -3,29 +3,39 @@ ...@@ -3,29 +3,39 @@
<mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper"> <mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper">
<select id="getCategoryCount" resultType="java.util.Map"> <select id="getCategoryCount" resultType="java.util.Map">
SELECT SELECT (SELECT
ibrfv.relation_form_id AS SEQUENCE_NBR, count(*)
ibjsi.ORG_BRANCH_NAME AS ORG_BRANCH_NAME,
ibjui.USE_UNIT_NAME AS USE_UNIT_NAME,
ibjri.EQU_LIST AS EQU_LIST
FROM FROM
( idx_biz_jg_use_info ibjui
( LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjui.RECORD = ibjsi.RECORD
( LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
( LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
( LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
amos_idx.idx_biz_record_form_view ibrfv LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
LEFT JOIN amos_tzs_biz.idx_biz_jg_supervision_info ibjsi ON ( ( ibrfv.records LIKE concat ( '%', ibjsi.RECORD, '%' ) ) ) WHERE
) ibjoi.claim_status = '待认领' AND ibjri."EQU_LIST" = #{code} ) waitClaim ,
LEFT JOIN amos_tzs_biz.idx_biz_jg_register_info ibjri ON ( ( ibrfv.records LIKE concat ( '%', ibjri.RECORD, '%' ) ) ) (SELECT
) COUNT( * )
LEFT JOIN amos_tzs_biz.idx_biz_jg_use_info ibjui ON ( ( ibrfv.records LIKE concat ( '%', ibjui.RECORD, '%' ) ) ) FROM
) idx_biz_jg_use_info ibjui
LEFT JOIN amos_tzs_biz.idx_biz_jg_other_info ibjoi ON ( ( ibrfv.records LIKE concat ( '%', ibjoi.RECORD, '%' ) ) ) LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjui.RECORD = ibjsi.RECORD
) LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ( ( ibjri.EQU_CATEGORY = tec.code ) ) LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
) LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
WHERE
ibjoi.claim_status = '已认领' AND ibjri."EQU_LIST" = #{code} ) alreadyClaim,
(SELECT
COUNT( * )
FROM
idx_biz_jg_use_info ibjui
LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjui.RECORD = ibjsi.RECORD
LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui.RECORD = ibjri.RECORD
LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
WHERE
ibjoi.claim_status = '已拒领' AND ibjri."EQU_LIST" = #{code} ) refuseClaim
</select> </select>
<select id="getAdministrativeDivision" resultType="java.util.Map"> <select id="getAdministrativeDivision" resultType="java.util.Map">
......
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 @ c038d5f3
...@@ -103,28 +103,14 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD ...@@ -103,28 +103,14 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
for (Map map : mapList) { for (Map map : mapList) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
//todo sql待定，目前为假数据 Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString());
// Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString());
Map<String, Object> objectMap = new HashMap<>();
objectMap.put("waitClaim", 985);
objectMap.put("alreadyClaim", 18985);
objectMap.put("refuseClaim", 985);
List<Map<String, Object>> list1 = new ArrayList<>();
Map<String, List<Map<String, Object>>> jsonMap = JsonUtils.getResourceJson(equipStatus);
List<Map<String, Object>> equipStatusList = jsonMap.get(EquipmentClassifityEnum.SBRLZT.getCode());
for (Map equipStatusMap : equipStatusList) {
Map<String, Object> map1 = new HashMap<>();
map1.put("name", equipStatusMap.get("value"));
map1.put("value", objectMap.get(equipStatusMap.get("value")));
list1.add(map1);
}
resultMap.put("name", map.get("name")); resultMap.put("name", map.get("name"));
resultMap.put("image", map.get("image")); resultMap.put("image", map.get("image"));
resultMap.put("waitClaim", 985); resultMap.put("waitClaim", map1.get("waitClaim"));
resultMap.put("alreadyClaim", 18985); resultMap.put("alreadyClaim", map1.get("alreadyClaim"));
resultMap.put("refuseClaim", 985); resultMap.put("refuseClaim", map1.get("refuseClaim"));
resultMap.put("sum", 20955); Long sum = Long.valueOf(map1.get("waitClaim").toString()) + Long.valueOf(map1.get("alreadyClaim").toString()) + Long.valueOf(map1.get("refuseClaim").toString());
resultMap.put("value", list1); resultMap.put("sum", sum);
list.add(resultMap); list.add(resultMap);
} }
page.setCurrent(1); page.setCurrent(1);
...@@ -212,8 +198,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD ...@@ -212,8 +198,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
LinkedHashMap e = (LinkedHashMap) it.next(); LinkedHashMap e = (LinkedHashMap) it.next();
//修改数据 //修改数据
if (type.equals(e.get("parentRegionCode").toString())) { if (type.equals(e.get("parentRegionCode").toString())) {
e.put("children",null); e.put("children", null);
e.put("sequenceNbr",e.get("regionCode")); e.put("sequenceNbr", e.get("regionCode"));
list.add(e); list.add(e);
} }
if (!ObjectUtils.isEmpty(e.get("children"))) { if (!ObjectUtils.isEmpty(e.get("children"))) {
......
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