From 0889bec4abc655ae1da240f58b3f4eb1ff985887 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:40:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8C=89=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=BC=E5=AE=B9=E5=B8=82=E5=8C=97=E5=A4=9A?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=88=86=E7=B1=BB=E4=BB=A5=E5=8F=8A=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=9D=A5=E6=BA=90=E8=AF=9D=E9=A2=98=E7=9A=84=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E8=A1=A5=E5=BD=95=E4=B8=80=E6=9D=A1=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE(project=5Frelated=5Fperson?= =?UTF-8?q?nel)=20=E8=AF=9D=E9=A2=98id=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govproject/impl/GovProjectServiceImpl.java | 3 ++- .../resources/mapper/govproject/ProjectDao.xml | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index a9f42eedd3..6ea7acf652 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.govproject.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.constant.CustomerIdConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -559,7 +560,7 @@ public class GovProjectServiceImpl implements GovProjectService { })).collect(Collectors.toList()); //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 - List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "issue"); + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue"); //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 599a5da471..ea4c01f111 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -363,9 +363,18 @@ p.del_flag = '0' AND p.customer_id = #{customerId} AND p.origin = #{origin} - - #{code} - + + + + #{code} + + + + + pc.category_code LIKE CONCAT(#{code}, '%') + + + #{userId} From a0aff3425c47ace90b7d9cb4812fcf294095bc32 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:53:34 +0800 Subject: [PATCH 02/11] again --- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 6ea7acf652..4e7ab796af 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -560,7 +560,7 @@ public class GovProjectServiceImpl implements GovProjectService { })).collect(Collectors.toList()); //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 - List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue"); + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? formDTO.getCategoryCodeList() : secondCodeList), userIds, "issue"); //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); From ef9633c537c08c2495fd98acf3406c361b8b6de6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:56:56 +0800 Subject: [PATCH 03/11] again --- .../java/com/epmet/dataaggre/dao/govproject/ProjectDao.java | 1 + .../service/govproject/impl/GovProjectServiceImpl.java | 4 ++-- .../src/main/resources/mapper/govproject/ProjectDao.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 43ea091ab5..1532f33727 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -113,6 +113,7 @@ public interface ProjectDao extends BaseDao { * @author sun */ List getProjectCategoryList(@Param("customerId") String customerId, + @Param("categoryCodeList") List categoryCodeList, @Param("secondCodeList") List secondCodeList, @Param("userIds") List userIds, @Param("origin") String origin); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 4e7ab796af..24820240d4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -560,10 +560,10 @@ public class GovProjectServiceImpl implements GovProjectService { })).collect(Collectors.toList()); //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 - List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? formDTO.getCategoryCodeList() : secondCodeList), userIds, "issue"); + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), formDTO.getCategoryCodeList(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue"); //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 - List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); + List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), formDTO.getCategoryCodeList(), secondCodeList, userIds, "resiEvent"); //6.封装数据 //楼院小组下分类项目列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index ea4c01f111..85111f3f8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -370,7 +370,7 @@ - + pc.category_code LIKE CONCAT(#{code}, '%') From 2f6548cfef060b377cdf4a49b3150f6e255c8c68 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Jan 2022 11:06:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?/gov/org/building/treelist=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E5=A2=9E=E5=8A=A0showNum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/BuildingTreeLevelDTO.java | 9 ++++-- .../service/impl/BuildingServiceImpl.java | 31 ++++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java index 4ffa533faf..1ffb1b94c1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java @@ -20,7 +20,6 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; @@ -49,7 +48,13 @@ public class BuildingTreeLevelDTO implements Serializable { private String longitude; private String latitude; - + /** + * 选中组织：展示下级有children，例如，山东路街道(7)表示几个社区 + * 选中网格：展示下级有几个小区 + * 选中小区：展示有几栋楼 + * 选中具体某个楼栋：1号楼(70/100)表示共有100户，有70户住人了 + */ + private String showNum; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index c51ffbb4f1..15224eca5d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -126,6 +128,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setLongitude(item.getLongitude()); buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前组织有几个下级组织 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -149,6 +153,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setLongitude(item.getLongitude()); buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前网格下有几个小区 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -172,6 +178,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setLongitude(item.getLongitude()); buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前小区下，有几栋楼 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -198,6 +206,25 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setLongitude(item.getLongitude()); buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前楼栋共有多少户，有多少户有人住 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); + // 总单元数 + Integer totalUnitNum = null == item.getTotalUnitNum() ? NumConstant.ZERO : item.getTotalUnitNum(); + // 总楼层总数 + Integer totalFloorNum = null == item.getTotalFloorNum() ? NumConstant.ZERO : item.getTotalFloorNum(); + // *总户数 + Integer totalHouseNum = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum(); + //总户数=以上三个数相乘 + Integer total=totalUnitNum*totalFloorNum*totalHouseNum; + //已经添加了多少户 + LambdaQueryWrapper icHouseEntityWrapper = new QueryWrapper().lambda() + .in(IcHouseEntity::getBuildingId, item.getId()); + int count= icHouseDao.selectCount(icHouseEntityWrapper); + if(NumConstant.ZERO==total){ + buildingTreeLevelDTO.setShowNum(String.format("%s/%s",count,count)); + }else{ + buildingTreeLevelDTO.setShowNum(String.format("%s/%s",count,total)); + } return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -400,7 +427,9 @@ public class BuildingServiceImpl implements BuildingService { recursionCovertToTree(agencyEntity,customerAgencyList); } parent.setChildren(subList); - + if(!"building".equals(parent.getLevel())){ + parent.setShowNum(CollectionUtils.isEmpty(subList) ? NumConstant.ZERO_STR : String.valueOf(subList.size())); + } } From cf5d16830b8a703307c7a6a70a99536a24be1f3c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 11:11:48 +0800 Subject: [PATCH 05/11] again --- .../service/govproject/impl/GovProjectServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 24820240d4..6cd219c759 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -592,9 +592,14 @@ public class GovProjectServiceImpl implements GovProjectService { }); //当前分类下来源楼院小组的项目 groupList.forEach(gr -> { - if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) { + if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) && !formDTO.getProjectId().equals(gr.getProjectId())) { ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); groupPrList.add(project); + } else { + if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) { + ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); + groupPrList.add(project); + } } }); groupCa.setProjectList(groupPrList); From 1add5cff17fc361904d9c1e5a0ef10230c3979b5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Jan 2022 11:22:49 +0800 Subject: [PATCH 06/11] =?UTF-8?q?/gov/org/building/treelist=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E5=A2=9E=E5=8A=A0showName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java | 2 +- .../main/java/com/epmet/service/impl/BuildingServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java index 1ffb1b94c1..195336b46e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java @@ -55,6 +55,6 @@ public class BuildingTreeLevelDTO implements Serializable { * 选中具体某个楼栋：1号楼(70/100)表示共有100户，有70户住人了 */ private String showNum; - + private String showName; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 15224eca5d..ed8b1b7b85 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -430,6 +430,7 @@ public class BuildingServiceImpl implements BuildingService { if(!"building".equals(parent.getLevel())){ parent.setShowNum(CollectionUtils.isEmpty(subList) ? NumConstant.ZERO_STR : String.valueOf(subList.size())); } + parent.setShowName(String.format("%s(%s)",parent.getLabel(),parent.getShowNum())); } From 17aebb4e026f55579da35a94d32ad03c33a5ace0 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 26 Jan 2022 09:57:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5-?= =?UTF-8?q?=E5=8A=9E=E7=BB=93=E5=85=B3=E7=B3=BB=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8A=9E=E7=BB=93=E5=B1=82=E7=BA=A7=E6=98=AF=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E7=9A=84=E4=B8=BA=E8=87=AA=E5=8A=9E=EF=BC=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9A=84=E4=B8=BA=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DataReportingServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index 82d1a4a0e0..0752b72424 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -246,9 +246,9 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setEventDescription(project.getProjectContent()); dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N"); if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) { - dto.setWaysOfResolving(project.getOrgId().equals(project.getFinishOrg())?ProjectConstant.PROJECT_SELF_CLOSED:ProjectConstant.PROJECT_REPORT); //办结组织是机关时，办结层级为机关的层级 if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) { + dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT); //如果是孔村的项目办结层级需要降一级 if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) { if (StringUtils.isNotBlank(project.getFinishOrgLevel())) { @@ -268,6 +268,7 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setCompleteLevel(getCompleteLevel(project.getFinishOrgLevel())); } } else if (OrgTypeConstant.DEPARTMENT.equals(project.getFinishOrgType())) { + dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT); //办结组织是部门时，办结层级为部门所在组织的曾经 String[] orgIds = project.getOrgIdPath().split(StrConstant.COLON); int size = orgIds.length; @@ -276,6 +277,7 @@ public class DataReportingServiceImpl implements DataReportingService { dto.setCompleteLevel(getCompleteLevel(agency.getLevel())); } } else { + dto.setWaysOfResolving(ProjectConstant.PROJECT_SELF_CLOSED); //办结组织是网格时，办结层级为网格 dto.setCompleteLevel("5"); } From 7d6e9852fa670212e8904fd0b5e1428469bdb66c Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 26 Jan 2022 15:21:13 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 9eae5a851f..bc63091248 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-user.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./epmet-user.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 600M + memory: 1100M From e868d491e505b5c3e9ab0bccc37d6aa29df255d2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 26 Jan 2022 17:14:09 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B2=BB=E7=90=86-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E5=88=86=E6=9E=90-?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E5=85=88?= =?UTF-8?q?=E6=9A=82=E5=AE=9A=E6=9F=A5=E8=AF=A2=E4=B8=A4=E5=8D=83=E6=9D=A1?= =?UTF-8?q?=20=E9=98=B2=E6=AD=A2=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/govproject/ProjectDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 85111f3f8c..8bd1c33ee7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -259,6 +259,7 @@ AND `status` = #{status} AND created_time DATE_FORMAT(#{toDateId}, '%Y-%m-%d') ORDER BY created_time DESC + LIMIT 2000