From c58ea0a0a1af710f474e69d0b32f92be6278b058 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 19 May 2022 18:37:09 +0800
Subject: [PATCH] weiwandaixu

---
 .../java/com/epmet/dto/form/demand/ServiceListFormDTO.java | 7 +++++++
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 7 +++++++
 .../src/main/resources/mapper/IcUserDemandRecDao.xml       | 4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/ServiceListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/ServiceListFormDTO.java
index 3985df6fe0..f923bd1301 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/ServiceListFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/ServiceListFormDTO.java
@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class ServiceListFormDTO extends PageFormDTO implements Serializable {
@@ -19,5 +20,11 @@ public class ServiceListFormDTO extends PageFormDTO implements Serializable {
     private String serverId;
 
     private String customerId;
+    /**
+     * volunteer时传入此参数
+     */
+    private String idCard;
+
+    private List<String> serverIds;
 }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
index af160a4303..f680e038e5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
@@ -1734,6 +1734,13 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public PageData<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO) {
+        List<String> serverIds=new ArrayList<>();
+        if("community_org".equals(formDTO.getType())){
+            serverIds.add(formDTO.getServerId());
+        }else if("volunteer".equals(formDTO.getType())){
+            //    根据身份证号查询ic_resi_user.id+epmetUserId
+            //    todo
+        }
         PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryServiceList(formDTO));
         return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index eaf557b72b..5221f5309b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -654,7 +654,9 @@
         WHERE
             r.CUSTOMER_ID = #{customerId}
             AND r.STATUS = 'finished'
-            and s.SERVER_ID=#{serverId}
+            <foreach item="serverId" collection="serverIds" open="AND (" separator="or" close=")" index="">
+                 s.SERVER_ID = #{serverId}
+            </foreach>
             order by r.REPORT_TIME desc
     </select>
 </mapper>