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

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

@@ -401,7 +401,10 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
 
     @Override
     public List<IcCommunitySelfOrganizationEntity> queryListById(List<String> communityOrgIds) {
-        return baseDao.selectBatchIds(communityOrgIds);
+        if(CollectionUtils.isNotEmpty(communityOrgIds)){
+            return baseDao.selectBatchIds(communityOrgIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
 }

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

@@ -454,7 +454,10 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Override
     public List<IcPartyUnitEntity> queryListById(List<String> partyUnitIds) {
-        return baseDao.selectBatchIds(partyUnitIds);
+        if(CollectionUtils.isNotEmpty(partyUnitIds)){
+            return baseDao.selectBatchIds(partyUnitIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
     private String getServiceMatter(Map<String, String> map, String matter) {

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

@@ -270,7 +270,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
 
     @Override
     public List<IcSocietyOrgEntity> queryListById(List<String> socialOrgIds) {
-        return baseDao.selectBatchIds(socialOrgIds);
+        if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(socialOrgIds)){
+            return baseDao.selectBatchIds(socialOrgIds);
+        }
+        return Collections.EMPTY_LIST;
     }
 
 }

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

@@ -0,0 +1,22 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/12/24 10:38 上午
+ * @DESC
+ */
+@Data
+public class AppointmentRecordMiniFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -2963684994195809536L;
+
+    public interface AppointmentRecordMiniForm{}
+
+    @NotBlank(message = "gridId不能为空",groups = AppointmentRecordMiniForm.class)
+    private String gridId;
+}

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

@@ -47,6 +47,8 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private List<String> appointmentTime;
 
+    private String appointmentDate;
+
     @JsonIgnore
     private String timeId;
 
@@ -58,5 +60,6 @@ public class AppointmentRecordResultDTO implements Serializable {
         this.remark = "";
         this.appointmentTime = new ArrayList<>();
         this.recordId = "";
+        this.appointmentDate = "";
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPartyServiceCenterController.java

@@ -217,5 +217,17 @@ public class IcPartyServiceCenterController {
         return new Result<List<AllMattersResultDTO>>().ok(icPartyServiceCenterService.getAllMatters(formDTO));
     }
 
+    /**
+     * @Description  小程序端预约记录
+     * @param formDTO
+     * @author zxc
+     * @date 2021/12/24 10:18 上午
+     */
+    @PostMapping("appointmentrecordmini")
+    public Result<List<AppointmentRecordResultDTO>> appointmentRecordMini(@RequestBody AppointmentRecordMiniFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO,AppointmentRecordMiniFormDTO.AppointmentRecordMiniForm.class);
+        return new Result<List<AppointmentRecordResultDTO>>().ok(icPartyServiceCenterService.appointmentRecordMini(formDTO,tokenDto));
+    }
+
 
 }

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

@@ -44,6 +44,15 @@ public interface IcMatterAppointmentRecordDao extends BaseDao<IcMatterAppointmen
      */
     List<AppointmentRecordResultDTO> appointmentRecord(@Param("matterId")String matterId,@Param("date")String date);
 
+    /**
+     * @Description  小程序端预约列表
+     * @param orgId
+     * @param userId
+     * @author zxc
+     * @date 2021/12/24 10:25 上午
+     */
+    List<AppointmentRecordResultDTO> appointmentRecordMini(@Param("orgId")String orgId,@Param("userId")String userId);
+
     /**
      * @Description  查询事项是不是存在预约记录
      * @param matterIds

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

@@ -175,4 +175,12 @@ public interface IcPartyServiceCenterService extends BaseService<IcPartyServiceC
      */
     List<AllMattersResultDTO> getAllMatters(AllMattersFormDTO formDTO);
 
+    /**
+     * @Description  小程序端预约记录
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/24 10:18 上午
+     */
+    List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto);
+
 }

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

@@ -464,6 +464,21 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         return new ArrayList<>();
     }
 
+    /**
+     * @Description  小程序端预约记录
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/12/24 10:18 上午
+     */
+    @Override
+    public List<AppointmentRecordResultDTO> appointmentRecordMini(AppointmentRecordMiniFormDTO formDTO,TokenDto tokenDto) {
+        List<AppointmentRecordResultDTO> result = matterAppointmentRecordDao.appointmentRecordMini(formDTO.getGridId(), tokenDto.getUserId());
+        if (CollectionUtils.isNotEmpty(result)){
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
     public List<TimeDTO> getTimeList(String start,String end,Integer interval){
         List<TimeDTO> result = new ArrayList<>();
         List<String> intervalTimeList = getIntervalTimeList(start, end, interval);

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

@@ -45,4 +45,22 @@
             </foreach>
         GROUP BY matterId
     </select>
+
+    <!-- 小程序端预约列表 -->
+    <select id="appointmentRecordMini" resultType="com.epmet.dto.result.AppointmentRecordResultDTO">
+        SELECT
+            ar.APPOINTMENT_NAME,
+            ar.APPOINTMENT_PHONE,
+            ar.REMARK,
+            ar.TIME_ID,
+            cm.MATTER_NAME,
+            ar.ID AS recordId,
+            ar.APPOINTMENT_DATE
+        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
+          AND ar.ORG_ID = #{orgId}
+          AND ar.CREATED_BY = #{userId}
+          AND ar.`STATUS` = 'appointing'
+    </select>
 </mapper>