From eb2f7dfa3e69b526ab210c0d993927c3b7f50a79 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 29 Dec 2021 22:14:57 +0800
Subject: [PATCH] =?UTF-8?q?pc=E5=BD=95=E5=85=A5=E7=9A=84=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80=E6=98=BE=E7=A4=BA=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=BA=E7=9A=84=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80+?=
 =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=90=8D=E7=A7=B0=EF=BC=9B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90-=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8E=92=E9=99=A4=E5=B7=B2=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/demand/PageListAnalysisFormDTO.java  | 4 ++++
 .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java  | 6 ++----
 .../src/main/resources/mapper/IcUserDemandRecDao.xml        | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
index 464d1062a8..2eb55979b1 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/PageListAnalysisFormDTO.java
@@ -49,4 +49,8 @@ public class PageListAnalysisFormDTO implements Serializable {
 
     private Boolean pageFlag;
 
+    /**
+     * 数据分析-服务措施分析排除，已取消
+     */
+    private String excludeStatus;
 }
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 45a1e6f1f8..4732322466 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
@@ -231,10 +231,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         }
         HouseInfoDTO houseInfoDTO=houseInfoRes.getData().get(NumConstant.ZERO);
         insertEntity.setServiceLocation(houseInfoDTO.getNeighborAddress().
-                concat(houseInfoDTO.getNeighborHoodName())
-                .concat(houseInfoDTO.getBuildingName())
-                .concat(houseInfoDTO.getUnitName())
-                .concat(houseInfoDTO.getDoorName()));
+                concat(houseInfoDTO.getNeighborHoodName()));
         insertEntity.setLongitude(houseInfoDTO.getBuildingLongitude());
         insertEntity.setLatitude(houseInfoDTO.getBuildingLatitude());
         baseDao.insert(insertEntity);
@@ -726,6 +723,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public PageData<DemandRecResultDTO> pageListAnalysis(PageListAnalysisFormDTO formDTO) {
+        formDTO.setExcludeStatus(UserDemandConstant.CANCELED);
         if("agency".equals(formDTO.getOrgType())){
             //找到当前组织的所有上级，再拼接上自己
             Result<CustomerAgencyDTO> customerAgencyDTOResult=govOrgOpenFeignClient.getAgencyById(formDTO.getOrgId());
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 4298ad6186..d6447bf39e 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
@@ -298,6 +298,9 @@
         <if test="null != endDateId and endDateId != '' ">
             AND DATE_FORMAT(r.REPORT_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDateId}
         </if>
+        <if test="null != excludeStatus and excludeStatus !='' ">
+            and r.STATUS !=#{excludeStatus}
+        </if>
         order by r.WANT_SERVICE_TIME desc,r.REPORT_TIME asc
     </select>