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

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

@@ -14,17 +14,25 @@
         <result property="pmEndTime" column="pmEndTime"/>
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
-        <collection property="matterList" ofType="com.epmet.dto.MatterListDTO">
-            <result property="matterId" column="matterId"/>
-            <result property="allowTime" column="allowTime"/>
-            <result property="matterName" column="matterName"/>
-            <result property="startTime" column="startTime"/>
-            <result property="endTime" column="endTime"/>
-            <result property="appointmentType" column="appointmentType"/>
-            <result property="sort" column="sort"/>
-            <result property="matterImg" column="matterImg"/>
-        </collection>
+        <collection property="matterList" ofType="com.epmet.dto.MatterListDTO"
+        column="partyServiceCenterId" select="matterListByPartyServiceCenterId"/>
     </resultMap>
+    <select id="matterListByPartyServiceCenterId" resultType="com.epmet.dto.MatterListDTO">
+        select
+            cm.MATTER_NAME AS matterName,
+            cm.ID AS matterId,
+            cm.START_TIME AS startTime,
+            cm.END_TIME AS endTime,
+            cm.APPOINTMENT_TYPE AS appointmentType,
+            case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
+                 ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
+            IFNULL(cm.MATTER_IMG,'') AS matterImg
+        from ic_party_service_center_matter cm
+        where del_flag = 0
+            and PARTY_SERVICE_CENTER_ID = #{partyServiceCenterId}
+    </select>
     <select id="partyServiceCenterList" resultMap="partyServiceCenterListMap">
         SELECT
             sc.ID AS partyServiceCenterId,
@@ -36,19 +44,8 @@
             sc.PM_START_TIME AS pmStartTime,
             sc.PM_END_TIME AS pmEndTime,
             sc.LONGITUDE AS longitude,
-            sc.LATITUDE AS latitude,
-            cm.MATTER_NAME AS matterName,
-            cm.ID AS matterId,
-            cm.START_TIME AS startTime,
-            cm.END_TIME AS endTime,
-            cm.APPOINTMENT_TYPE AS appointmentType,
-            case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
-                 when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
-                 when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
-                 ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
-            IFNULL(cm.MATTER_IMG,'') AS matterImg
+            sc.LATITUDE AS latitude
         FROM ic_party_service_center sc
-        LEFT JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = sc.ID AND cm.DEL_FLAG = 0)
         WHERE sc.DEL_FLAG = 0
           AND ORG_ID = #{orgId}
         ORDER BY sc.CREATED_TIME DESC