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 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 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