【社区服务】修复：1.发起服务时候拼接的服务目标ID_PATH错误。2.服务记录列表查询加上当前组织条件

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java

@@ -25,5 +25,6 @@ public interface IcServiceRecordDao extends BaseDao<IcServiceRecordEntity> {
             @Param("serviceTimeStart") Date serviceTimeStart,
             @Param("serviceTimeEnd") Date serviceTimeEnd,
             @Param("serviceStatus") String serviceStatus,
-            @Param("satisfaction") String satisfaction);
+            @Param("satisfaction") String satisfaction,
+            @Param("searchOrgIdPath") String searchOrgIdPath);
 }

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

@@ -260,7 +260,7 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
             if ("0".equals(agencyInfo.getPid())) {
                 return new String[]{ agencyInfo.getId(), agencyInfo.getOrganizationName() };
             }
-            return new String[]{ agencyInfo.getPids().concat(":").concat(agencyInfo.getPid()), agencyInfo.getOrganizationName() };
+            return new String[]{ agencyInfo.getPids().concat(":").concat(agencyInfo.getId()), agencyInfo.getOrganizationName() };
         } else if ("grid".equals(scopeObjectType)) {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(scopeObjectId);
             // 网格的pids是到社区的

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml

@@ -36,6 +36,7 @@
                record.SERVICE_STATUS,
                record.SERVICE_PEOPLE_NUMBER
         from ic_service_record record
+                inner join ic_service_scope scope on (scope.DEL_FLAG = '0' and record.ID = scope.SERVICE_RECORD_ID)
                  left join ic_service_feedback feedback on (record.ID = feedback.SERVICE_RECORD_ID)
         <where>
             record.DEL_FLAG = '0'
@@ -61,6 +62,9 @@
             <if test="satisfaction != null and satisfaction != ''">
                 and feedback.SATISFACTION = #{satisfaction}
             </if>
+            <if test="searchOrgIdPath != null and searchOrgIdPath != ''">
+                and scope.OBJECT_ID_PATH like CONCAT(#{searchOrgIdPath}, '%')
+            </if>
         </where>
         order by record.CREATED_TIME desc
     </select>