Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java

@@ -42,7 +42,9 @@ public class ResiMyCreatedAgentServiceResultDTO {
 
     private String processStatusName;
 
-    private Integer satisfaction;
+    private Integer satisfication;
+
+    private String satisficationName;
 
     private List<String> attachments;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -122,6 +122,17 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
                 log.error("【红色待办】居民-我创建的列表：未找到服务类别数据:{}", e.getServiceCategory());
             }
 
+            // 满意度中文
+            if (e.getSatisfication() != null) {
+                if (e.getSatisfication().intValue() == -1) {
+                    d.setSatisficationName("不满意");
+                } else if (e.getSatisfication().intValue() == 0) {
+                    d.setSatisficationName("基本满意");
+                } else if (e.getSatisfication().intValue() == 1) {
+                    d.setSatisficationName("非常满意");
+                }
+            }
+
             // 反序列化附件列表
             d.setAttachments(JSON.parseArray(e.getAttachments(), String.class));
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -658,8 +658,9 @@ public class IcEventController {
     public Result<List<IcEventResultDTO>> getEventListByTypeOrStatus(@RequestParam("orgId") String orgId,
                                                                      @RequestParam("orgType") String orgType,
                                                                      @RequestParam("sourceType") String sourceType,
-                                                                     @RequestParam("status") String status) {
+                                                                     @RequestParam("status") String status,
-        return new Result<List<IcEventResultDTO>>().ok(icEventService.getListByStatus(orgId, orgType, sourceType, status));
+                                                                     @RequestParam("categoryCode") String categoryCode) {
+        return new Result<List<IcEventResultDTO>>().ok(icEventService.getListByStatus(orgId, orgType, sourceType, status,categoryCode));
     }
 
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@@ -211,9 +211,11 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
                                      @Param("sourceType") String sourceType,
                                      @Param("manageType") String manageType);
 
-    List<IcEventResultDTO> getListByStatus(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("status") String status);
+    List<IcEventResultDTO> getListByStatus(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType,
+                                           @Param("status") String status, @Param("categoryCode") String categoryCode);
 
-    List<IcEventResultDTO> getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("eventType") String eventType);
+    List<IcEventResultDTO> getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath,
+                                                          @Param("sourceType") String sourceType, @Param("eventType") String eventType);
 
     List<GridOrVillageEventRateResultDTO> getEventRateByGridIds(@Param("orgIds") List<String> orgIds);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@@ -282,7 +282,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
      * @param status 事件处理状态
      * @return
      */
-    List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String sourceType, String status);
+    List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String sourceType, String status,String categoryCode);
 
     List<IcEventResultDTO> getListBySourceTypeOrEventType(String orgId, String orgType, String sourceType, String eventType);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -2019,7 +2019,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 }
                 List<String> ids = orgs.stream().map(IcEventAnalysisOrgResDTO::getOrgId).collect(Collectors.toList());
                 List<GridOrVillageEventRateResultDTO> resultList = baseDao.getEventRateByGridIds(ids);
-                if(null != resultList && resultList.size()> 0){
+                if (null != resultList && resultList.size() > 0) {
                     for (GridOrVillageEventRateResultDTO dto : resultList) {
                         if (null != dto) {
                             dto.setAgencyName(namesMap.get(dto.getOrgId()));
@@ -2032,8 +2032,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                             dtoList.add(dto);
                         }
                     }
-                }else {
+                } else {
-                    namesMap.keySet().forEach(key->{
+                    namesMap.keySet().forEach(key -> {
                         GridOrVillageEventRateResultDTO dto = new GridOrVillageEventRateResultDTO();
                         dto.setOrgId(key);
                         dto.setAgencyName(namesMap.get(key));
@@ -2049,8 +2049,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
     }
 
     @Override
-    public List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String sourceType, String status) {
+    public List<IcEventResultDTO> getListByStatus(String orgId, String orgType, String sourceType, String status, String categoryCode) {
-        return baseDao.getListByStatus(getOrgPath(orgId, orgType), sourceType, status);
+        return baseDao.getListByStatus(getOrgPath(orgId, orgType), sourceType, status, categoryCode);
     }
 
     @Override

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -646,6 +646,9 @@
             <if test="null != status and status != ''">
                 AND r.MANAGE_STATUS = #{status}
             </if>
+            <if test="null != categoryCode and categoryCode != ''">
+                AND c.CATEGORY_CODE = #{categoryCode}
+            </if>
         </where>
         GROUP BY e.ID,c.ic_event_id,r.ic_event_id
         ORDER BY r.MANAGE_TIME DESC,e.CREATED_TIME DESC