Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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;
+
     /**
      * 下级结果集
      */

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 = "";

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

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -712,7 +712,8 @@
             </if>
             IFNULL(longitude,'') AS longitudeOrigin,
             IFNULL(latitude,'') AS latitudeOrigin,
-            IFNULL(coordinates,'') AS coordinates
+            IFNULL(coordinates,'') AS coordinates,
+            description
         FROM
             <if test='type == "agency" '>
                 customer_agency

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<IcEventDao, IcEventEntit
             //如果事件已经存在处理流程，且当前处理流程状态大于之前的状态则更新最新的处理状态
             entity.setReplyStatus(formDTO.getManageStatus());
         }
+        //修正或同步更新事件响应级别
+        if (formDTO.getManageStatus() >= 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<IcEventDao, IcEventEntit
                     dto.setGuiDangRate(new BigDecimal((double) temp / total).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.getMessage();
         }
         return dto;

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<LingShanScreenPartyActTypeAndQtyResultDTO> l = partyActDao.getPartyActTypeAndQuantity(EpmetRequestHolder.getLoginUserCustomerId(), PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids()));
+
+        List<String> type2beReturn = Arrays.asList("wmfwhd", "ljgj", "ztdr");
+
+        // 只返回上面的这几种
+        return l.stream().filter(e -> type2beReturn.contains(e.getActTypeKey())).collect(Collectors.toList());
     }
 
     @Override