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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AllMattersResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -40,6 +41,12 @@ public class AllMattersResultDTO implements Serializable {
 
     private String centerName;
 
+    @JsonIgnore
+    private String startTime;
+
+    @JsonIgnore
+    private String endTime;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java

@@ -51,6 +51,8 @@ public class AppointmentRecordResultDTO implements Serializable {
 
     @JsonIgnore
     private String timeId;
+    @JsonIgnore
+    private String matterId;
 
     public AppointmentRecordResultDTO() {
         this.sort = NumConstant.ZERO;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPartyServiceCenterDao.java

@@ -59,4 +59,6 @@ public interface IcPartyServiceCenterDao extends BaseDao<IcPartyServiceCenterEnt
      */
     List<AllMattersResultDTO> getAllMatters(@Param("orgId")String orgId);
 
+    List<AllMattersResultDTO> getAllMattersByOrgId(@Param("matterIds")List<String> matterIds);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -534,6 +534,20 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         if (CollectionUtils.isNotEmpty(result)){
             return result;
         }
+        List<AllMattersResultDTO> allMatters = baseDao.getAllMattersByOrgId(result.stream().map(m -> m.getMatterId()).collect(Collectors.toList()));
+        allMatters.forEach(matter -> {
+            List<TimeDTO> timeList = getTimeList(matter.getStartTime(), matter.getEndTime(), NumConstant.THIRTY);
+            AtomicReference<Integer> sort = new AtomicReference<>(NumConstant.ONE);
+            result.forEach(r -> {
+                if (r.getMatterId().equals(matter.getMatterId())){
+                    r.setSort(sort.getAndSet(sort.get() + NumConstant.ONE));
+                    List<String> time = new ArrayList<>();
+                    List<String> list = Arrays.asList(r.getTimeId().split(","));
+                    list.forEach(l -> timeList.stream().filter( t -> l.equals(t.getTimeId())).forEach(t -> time.add(t.getTime())));
+                    r.setAppointmentTime(time);
+                }
+            });
+        });
         return new ArrayList<>();
     }
 

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

@@ -21,7 +21,8 @@
             ar.REMARK,
             ar.TIME_ID,
             cm.MATTER_NAME,
-            ar.ID AS recordId
+            ar.ID AS recordId,
+            ar.matter_id as matterId
         FROM ic_matter_appointment_record ar
         LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0)
         WHERE ar.DEL_FLAG = 0
@@ -55,7 +56,8 @@
             ar.TIME_ID,
             cm.MATTER_NAME,
             ar.ID AS recordId,
-            ar.APPOINTMENT_DATE
+            ar.APPOINTMENT_DATE,
+            ar.MATTER_ID as matterId
         FROM ic_matter_appointment_record ar
         LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0)
         WHERE ar.DEL_FLAG = 0

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

@@ -102,4 +102,19 @@
         WHERE sc.DEL_FLAG = 0
           AND ID = #{centerId}
     </select>
+
+
+    <select id="getAllMattersByOrgId" resultType="com.epmet.dto.result.AllMattersResultDTO">
+        SELECT
+            cm.ID AS matterId,
+            cm.start_time,
+            cm.end_time
+        FROM ic_party_service_center_matter cm
+        where cm.DEL_FLAG = 0
+            AND cm.MATTER_ID in (
+                <foreach collection="matterIds" item="m" separator=",">
+                    #{m}
+                </foreach>
+            )
+    </select>
 </mapper>