From bb0f1dcb8684cfa01a7b9d4315e8fcfc03761858 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Jun 2021 14:27:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gridId=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/RecordListFormDTO.java | 1 - .../src/main/resources/mapper/StaffPatrolRecordDao.xml | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java index cfaf7a62c4..8d5f8413f1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RecordListFormDTO.java @@ -20,7 +20,6 @@ public class RecordListFormDTO implements Serializable { @NotBlank(message = "staffId不能为空",groups = RecordListForm.class) private String staffId; - @NotBlank(message = "网格ID不能为空",groups = RecordListForm.class) private String gridId; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml index 2e760a499e..002c2372b9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml @@ -29,12 +29,14 @@ From 2bea7290b1bb3ebbe0628546937c0190d232b37b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Jun 2021 18:23:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/PingYinConstant.java | 2 +- ...eenProjectCategoryOrgDailyServiceImpl.java | 30 +++++-------------- .../ScreenProjectCategoryOrgDailyDao.xml | 5 ++++ 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java index 8586f6f2af..16526ef4fe 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java @@ -13,6 +13,6 @@ public interface PingYinConstant { String JIN_SHUI_AGENCY_ID = "1215437824174608386"; String JIN_SHUI__CUSTOMER_ID = "f5ff0770f409981c73adda6ae35143ef"; - String YU_SHAN_AGENCY_ID = ""; + String YU_SHAN_AGENCY_ID = "1258587398679126017"; String YU_SHAN_CUSTOMER_ID = "a4bbf298d8e427844038cee466f022ef"; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java index e87a8567fa..9eb8ac99ea 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.constant.DataSourceConstant; +import com.epmet.constant.PingYinConstant; import com.epmet.constant.ScreenConstant; import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryGridDailyDao; import com.epmet.dao.evaluationindex.screen.ScreenProjectCategoryOrgDailyDao; @@ -352,6 +353,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl relationInfo,List agencyIdList){ List result = new ArrayList<>(); + List orgIds = new ArrayList<>(); if (isGrid){ // community级别走这 List categoryInfos = gridDailyDao.selectCategoryInfo(customerId, dateId,null,null); @@ -428,34 +430,18 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl entities = ConvertUtils.sourceToTarget(sonResult, ScreenProjectCategoryOrgDailyEntity.class); result.addAll(entities); } - /*if (!CollectionUtils.isEmpty(categoryProjectExists)){ - result.forEach(r -> { - categoryProjectExists.forEach(c -> { - if (r.getCategoryCode().equals(c.getCategoryCode())){ - r.setProjectTotal(r.getProjectTotal() + c.getProjectTotal()); - c.setStatus(true); - } - }); - }); - Map> groupByStatus = categoryProjectExists.stream().collect(Collectors.groupingBy(CategoryProjectResultDTO::getStatus)); - List categoryProjectFalse = groupByStatus.get(false); - if (!CollectionUtils.isEmpty(categoryProjectFalse)){ - List f = ConvertUtils.sourceToTarget(categoryProjectFalse, ScreenProjectCategoryOrgDailyEntity.class); - result.addAll(f); - } - } - if (!CollectionUtils.isEmpty(categoryProjectNotExists)){ - List notExists = ConvertUtils.sourceToTarget(categoryProjectNotExists, ScreenProjectCategoryOrgDailyEntity.class); - result.addAll(notExists); - }*/ + // 添加此 锦水、孔村、榆山 orgId，删除时使用 + orgIds.add(PingYinConstant.JIN_SHUI_AGENCY_ID); + orgIds.add(PingYinConstant.KONG_CUN_AGENCY_ID); + orgIds.add(PingYinConstant.YU_SHAN_AGENCY_ID); } } // 目前不考虑计算子客户组织直接创建的项目，只算内部客户 - List orgIds = new ArrayList<>(); Map> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel)); List levelAgencyInfo = groupByLevel.get(level); if (!CollectionUtils.isEmpty(levelAgencyInfo)) { - orgIds = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList()); + List orgIdss = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList()); + orgIds.addAll(orgIdss); // 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】 List screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId); if (!CollectionUtils.isEmpty(result)) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml index 9a4718aca8..57d2057539 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -65,6 +65,11 @@ od.CUSTOMER_ID = #{id} ) + AND ( + + cd.CUSTOMER_ID = #{id} + + ) AND cd.EPMET_CATEGORY_CODE IS NOT NULL