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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AppointmentMiniFormDTO.java

@@ -53,10 +53,12 @@ public class AppointmentMiniFormDTO implements Serializable {
     /**
      * 组织ID
      */
+    @NotBlank(message = "orgId不能为空",groups = AppointmentMiniForm.class)
     private String orgId;
 
     /**
      * 组织类型，grid：网格，agency：组织
      */
+    @NotBlank(message = "orgType不能为空",groups = AppointmentMiniForm.class)
     private String orgType;
 }

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

@@ -41,6 +41,8 @@ public class AppointmentRecordResultDTO implements Serializable {
     private String remark;
 
     private String recordId;
+    private String centerName;
+    private String address;
 
     /**
      * 预约时间
@@ -51,6 +53,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

@@ -348,19 +348,10 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
                 throw new RenException(EpmetErrorCode.APPOINTMENT_TIME_ERROR.getCode());
             }
         }
-        Result<RegisterRelationDTO> registerRelation = userOpenFeignClient.resiRelationInfo(tokenDto.getUserId());
-        if (!registerRelation.success()){
-            throw new EpmetException(String.format("查询居民{%s}信息失败",tokenDto.getUserId()));
-        }
         IcMatterAppointmentRecordEntity e = ConvertUtils.sourceToTarget(formDTO, IcMatterAppointmentRecordEntity.class);
         e.setCustomerId(customerId);
-        if (StringUtils.isNotBlank(formDTO.getOrgId())){
-            e.setOrgId(formDTO.getOrgId());
-            e.setOrgType(formDTO.getOrgType());
-        }else {
-            e.setOrgId(registerRelation.getData().getGridId());
-            e.setOrgType(PartyServiceCenterConstant.ORG_TYPE_GRID);
-        }
+        e.setOrgId(formDTO.getOrgId());
+        e.setOrgType(formDTO.getOrgType());
         if (e.getOrgType().equals(PartyServiceCenterConstant.ORG_TYPE_GRID)){
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(e.getOrgId());
             if (null == gridInfo){
@@ -540,10 +531,24 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
     @Override
     public List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto) {
         List<AppointmentRecordResultDTO> result = matterAppointmentRecordDao.appointmentRecordMini(formDTO.getGridId(), tokenDto.getUserId());
-        if (CollectionUtils.isNotEmpty(result)){
-            return result;
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
         }
-        return new ArrayList<>();
+        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 result;
     }
 
     /**

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,9 +56,13 @@
             ar.TIME_ID,
             cm.MATTER_NAME,
             ar.ID AS recordId,
-            ar.APPOINTMENT_DATE
+            ar.APPOINTMENT_DATE,
+            ar.MATTER_ID as matterId,
+            c.CENTER_NAME,
+            c.ADDRESS
         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)
+        LEFT JOIN ic_party_service_center c ON (c.ID = cm.PARTY_SERVICE_CENTER_ID AND c.DEL_FLAG = 0)
         WHERE ar.DEL_FLAG = 0
           AND ar.ORG_ID = #{orgId}
           AND ar.CREATED_BY = #{userId}

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.ID in (
+                <foreach collection="matterIds" item="m" separator=",">
+                    #{m}
+                </foreach>
+            )
+    </select>
 </mapper>