From e3830bb5d00aa65a0d4c6534659e433b69182496 Mon Sep 17 00:00:00 2001
From: guohb <ghb01699725@alibaba-inc.com>
Date: Mon, 29 Apr 2024 17:14:59 +0800
Subject: [PATCH] fixBug

---
 .../resources/mapper/AuditStatusMapper.xml    |  2 +-
 .../service/impl/AuditStatusServiceImpl.java  | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml
index 37df86379..119425cf8 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml
@@ -107,7 +107,7 @@
                 AND lai.create_time BETWEEN  #{startTime} AND #{endTime}
             </if>
             <if test="region != null and region != ''">
-                AND l.want_shop_area_id = #{region}
+                and l.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{areaPath}, '%'))
             </if>
             <if test="checkStatus != null">
                 AND a.audit_status = #{checkStatus}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java
index d97221d5c..c930a03ab 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java
@@ -7,10 +7,7 @@ import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.HyOpenAreaInfoDAO;
 import com.cool.store.dao.LineAuditInfoDAO;
 import com.cool.store.dao.LineInfoDAO;
-import com.cool.store.entity.AuditStatusDO;
-import com.cool.store.entity.LineAuditInfoDO;
-import com.cool.store.entity.LineInfoDO;
-import com.cool.store.entity.LineInterviewDO;
+import com.cool.store.entity.*;
 import com.cool.store.enums.AuditResultTypeEnum;
 import com.cool.store.mapper.AuditStatusMapper;
 import com.cool.store.mapper.LineInterviewMapper;
@@ -20,18 +17,15 @@ import com.cool.store.response.AuditDetailResponse;
 import com.cool.store.response.CheckListResponse;
 import com.cool.store.service.AuditStatusService;
 import com.cool.store.utils.poi.DateUtils;
-import com.cool.store.vo.BaseInfoVO;
-import com.cool.store.vo.LineListVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -71,7 +65,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
         if (request.getCheckStatus().equals(0)) {
             auditInfo.setResultType(AuditResultTypeEnum.PASS.getCode());
             auditInfo.setPassReason(request.getCheckResult());
-        } else if (request.getCheckStatus().equals(1)){
+        } else if (request.getCheckStatus().equals(1)) {
             auditInfo.setResultType(AuditResultTypeEnum.REJECT.getCode());
             auditInfo.setRejectPublicReason(request.getCheckResult());
             auditInfo.setRejectRealReason(request.getCheckResult());
@@ -128,7 +122,13 @@ public class AuditStatusServiceImpl implements AuditStatusService {
                                                  Integer checkStage,
                                                  Integer pageNum,
                                                  Integer pageSize) {
-        PageHelper.startPage(pageNum,pageSize);
+        if (Objects.nonNull(region)) {
+            HyOpenAreaInfoDO areaInfo = hyOpenAreaInfoDAO.selectById(Long.valueOf(region));
+            if (Objects.nonNull(areaInfo)) {
+                region = areaInfo.getAreaPath();
+            }
+        }
+        PageHelper.startPage(pageNum, pageSize);
         List<CheckListResponse> checkListResponses = auditStatusMapper.checkList(partnerNameOrPhone, startTime, endTime, region, checkStatus, checkStage, pageNum, pageSize);
         //意向区域
         List<Long> wantRegions = checkListResponses.stream().map(CheckListResponse::getWantRegion).collect(Collectors.toList());
@@ -143,7 +143,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
         //面审人Map
         Map<String, String> intervieweeIdMap = enterpriseUserDAO.getUserNameMap(intervieweeIds);
 
-        checkListResponses.forEach(x->{
+        checkListResponses.forEach(x -> {
             x.setIntervieweeName(intervieweeIdMap.get(x.getIntervieweeId()));
             x.setWantRegionName(wantShopAreaMap.get(x.getWantRegion()));
             x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId()));