From bab4098e7984896084fee85b8d009b3cb6fdc60c Mon Sep 17 00:00:00 2001 From: luyan Date: Fri, 26 May 2023 09:59:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=93=8D=E5=BA=94=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcEventServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 6db34156ac..f457fc1071 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -806,6 +806,14 @@ public class IcEventServiceImpl extends BaseServiceImpl= 2 && !entity.getEventType().equals("3")) { + //如果大于等2，则标定蓝灯事件 + entity.setEventType("3"); + } else if (formDTO.getManageStatus() == 1 && !entity.getEventType().equals("1")) { + //如果等于1，则标定黄灯事件，其他均为红灯事件 + entity.setEventType("1"); + } baseDao.updateById(entity); //3.新增回复数据 @@ -2017,7 +2025,7 @@ public class IcEventServiceImpl extends BaseServiceImpl Date: Fri, 26 May 2023 18:00:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=B7=A6=E8=BE=B9?= =?UTF-8?q?=EF=BC=8C=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=9D=A1=EF=BC=8C=E5=8F=AA=E8=BF=94=E5=9B=9E=EF=BC=9A=E8=81=94?= =?UTF-8?q?=E5=BB=BA=E5=85=B1=E5=BB=BA=E3=80=81=E4=B8=BA=E6=B0=91=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E3=80=81=E4=B8=BB=E9=A2=98=E5=85=9A=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LingShanScreenServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 32c44d5198..7d94ed82ee 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -115,7 +115,12 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD if (agencyInfo == null) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); } - return partyActDao.getPartyActTypeAndQuantity(EpmetRequestHolder.getLoginUserCustomerId(), PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids())); + List l = partyActDao.getPartyActTypeAndQuantity(EpmetRequestHolder.getLoginUserCustomerId(), PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids())); + + List type2beReturn = Arrays.asList("wmfwhd", "ljgj", "ztdr"); + + // 只返回上面的这几种 + return l.stream().filter(e -> type2beReturn.contains(e.getActTypeKey())).collect(Collectors.toList()); } @Override From b645c7821ca989294632cd92d65e4bfdeec71f05 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 29 May 2023 09:39:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?/maporg=E5=A2=9E=E5=8A=A0=20description?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/MapOrgResultDTO.java | 9 +++++++++ .../java/com/epmet/dto/result/MapSonOrgResultDTO.java | 2 ++ .../java/com/epmet/service/impl/AgencyServiceImpl.java | 2 ++ .../src/main/resources/mapper/CustomerAgencyDao.xml | 3 ++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java index 5ad5436d9a..330135fec7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java @@ -59,6 +59,15 @@ public class MapOrgResultDTO implements Serializable { */ private String agencyLevel; + /** + * @Description: 描述，简介。灵山用的 + * @param null: + * @Return + * @Author: wangxianzhang + * @Date: 2023/5/29 9:23 AM + */ + private String description; + /** * 下级结果集 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java index ae9df9beec..a686336ef2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java @@ -57,6 +57,8 @@ public class MapSonOrgResultDTO implements Serializable { */ private String agencyLevel; + private String description; + public MapSonOrgResultDTO() { this.longitudeOrigin = ""; this.latitudeOrigin = ""; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 19eb47111c..09c1a851b5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -788,6 +788,8 @@ public class AgencyServiceImpl implements AgencyService { if (StringUtils.isNotBlank(customerAgencyEntity.getLongitude())) { result.setLongitude(new BigDecimal(customerAgencyEntity.getLongitude())); } + // 灵山要，非要 + result.setDescription(customerAgencyEntity.getDescription()); if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)) { CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId()); if (null == entity) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 8005814843..c4657762e3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -712,7 +712,8 @@ IFNULL(longitude,'') AS longitudeOrigin, IFNULL(latitude,'') AS latitudeOrigin, - IFNULL(coordinates,'') AS coordinates + IFNULL(coordinates,'') AS coordinates, + description FROM customer_agency