From b19ec338f5cbdd93e9f77579ee96d6c6037acdfe Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 09 Feb 2022 15:26:32 +0800
Subject: [PATCH] 督办单列表加入区域名字
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 7a6d770..7057c08 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -1,12 +1,15 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Supervision;
+import com.moral.api.entity.SysArea;
import com.moral.api.mapper.SupervisionMapper;
import com.moral.api.service.SupervisionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.FileUtils;
@@ -43,6 +46,9 @@
@Autowired
private SupervisionMapper supervisionMapper;
+
+ @Autowired
+ private SysAreaService sysAreaService;
@Override
@Transactional
@@ -114,13 +120,27 @@
supervisionMapper.selectPage(supervisionPage, queryWrapper);
List<Supervision> supervisions = supervisionPage.getRecords();
+ //������������������
+ List<Map<String, Object>> item = new ArrayList<>();
+ QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
+ sysAreaQueryWrapper.eq("area_code", cityCode);
+ SysArea one = sysAreaService.getOne(sysAreaQueryWrapper);
+ String cityName = one.getAreaName();
+ for (Supervision supervision : supervisions) {
+ Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(supervision), Map.class);
+ map.remove("isDelete");
+ map.remove("createTime");
+ map.remove("updateTime");
+ map.put("cityName", cityName);
+ item.add(map);
+ }
Map<String, Object> result = new LinkedHashMap<>();
result.put("total", supervisionPage.getTotal());
result.put("totalPage", supervisionPage.getPages());
result.put("current", supervisionPage.getCurrent());
result.put("pageSize", supervisionPage.getSize());
- result.put("item", supervisions);
+ result.put("item", item);
return result;
}
--
Gitblit v1.8.0