From 273defb3cc6cbbd74494a853a23cb8fe14c22b8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Feb 2022 14:33:16 +0800
Subject: [PATCH] 督办单增加组织id
---
screen-api/src/main/java/com/moral/api/service/SupervisionService.java | 1 +
screen-api/src/main/resources/mapper/SupervisionMapper.xml | 1 +
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 35 ++++++++---------------------------
screen-api/src/main/java/com/moral/api/entity/Supervision.java | 5 +++++
4 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Supervision.java b/screen-api/src/main/java/com/moral/api/entity/Supervision.java
index a527762..a89e3fa 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Supervision.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Supervision.java
@@ -33,6 +33,11 @@
private Integer id;
/**
+ * ������id
+ */
+ private Integer organizationId;
+
+ /**
* ������������
*/
private Integer cityCode;
diff --git a/screen-api/src/main/java/com/moral/api/service/SupervisionService.java b/screen-api/src/main/java/com/moral/api/service/SupervisionService.java
index 3b7acb4..551227d 100644
--- a/screen-api/src/main/java/com/moral/api/service/SupervisionService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SupervisionService.java
@@ -26,6 +26,7 @@
//���������������
Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision);
+ //���������������
void deleteSupervision(Integer supervisionId);
}
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 92d2d94..3cedb26 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
@@ -2,11 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.Supervision;
import com.moral.api.mapper.SupervisionMapper;
-import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SupervisionService;
@@ -50,9 +48,6 @@
@Autowired
private OrganizationService organizationService;
-
- @Autowired
- private MonitorPointService monitorPointService;
@Override
@Transactional
@@ -104,30 +99,17 @@
int size = Integer.parseInt(params.get("size").toString());
Object start = params.get("start");
Object end = params.get("end");
+ Integer orgId = Integer.parseInt(params.get("organizationId").toString());
+ //������������������������������
+ List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(orgId);
QueryWrapper<Supervision> supervisionQueryWrapper = new QueryWrapper<>();
- supervisionQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
- if (params.get("organizationId") != null) {
- Integer orgId = Integer.parseInt(params.get("organizationId").toString());
- //������������������������������
- List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
- List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
- orgIds.add(orgId);
- QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("city_code")
- .eq("is_delete", Constants.NOT_DELETE)
- .in("organization_id", orgIds);
-
- //������������id������������������������code
- List<Object> cityCodes = monitorPointService.listObjs(queryWrapper);
-
- cityCodes = cityCodes.stream()
- .distinct()
- .collect(Collectors.toList());
-
- supervisionQueryWrapper.in("CONCAT(LEFT(city_code,4),'00')", cityCodes);
- } else {
+ supervisionQueryWrapper.eq("is_delete", Constants.NOT_DELETE).in("organization_id", orgIds);
+ //���������������������������������������������������������������������������������������������������������������������������
+ if (params.get("cityCode") != null) {
String cityCode = params.get("cityCode").toString();
//���������������������������������������������������������������������������������������
if (cityCode.endsWith("00")) {
@@ -136,7 +118,6 @@
supervisionQueryWrapper.eq("city_code", cityCode);
}
}
-
if (start != null) {
supervisionQueryWrapper.ge("time", start);
diff --git a/screen-api/src/main/resources/mapper/SupervisionMapper.xml b/screen-api/src/main/resources/mapper/SupervisionMapper.xml
index 90d0d3b..7255ee5 100644
--- a/screen-api/src/main/resources/mapper/SupervisionMapper.xml
+++ b/screen-api/src/main/resources/mapper/SupervisionMapper.xml
@@ -5,6 +5,7 @@
<!-- ������������������������ -->
<resultMap id="BaseResultMap" type="com.moral.api.entity.Supervision">
<id column="id" property="id"/>
+ <result column="organization_id" property="organizationId"/>
<result column="city_code" property="cityCode"/>
<result column="city_name" property="cityName"/>
<result column="time" property="time"/>
--
Gitblit v1.8.0