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

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;
 }

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.getNeighborHoodName()));
-                .concat(houseInfoDTO.getBuildingName())
-                .concat(houseInfoDTO.getUnitName())
-                .concat(houseInfoDTO.getDoorName()));
         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());

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>