suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-29 17:19:08 +08:00
parent 66831dbb26 e3830bb5d0
commit a1f9fa6241
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml
View File

@@ -107,7 +107,7 @@
AND lai.create_time BETWEEN #{startTime} AND #{endTime} AND lai.create_time BETWEEN #{startTime} AND #{endTime}
</if> </if>
<if test="region != null and region != ''"> <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>
<if test="checkStatus != null"> <if test="checkStatus != null">
AND a.audit_status = #{checkStatus} AND a.audit_status = #{checkStatus}

22
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditStatusServiceImpl.java
View File

@@ -7,10 +7,7 @@ import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.HyOpenAreaInfoDAO; import com.cool.store.dao.HyOpenAreaInfoDAO;
import com.cool.store.dao.LineAuditInfoDAO; import com.cool.store.dao.LineAuditInfoDAO;
import com.cool.store.dao.LineInfoDAO; import com.cool.store.dao.LineInfoDAO;
import com.cool.store.entity.AuditStatusDO; import com.cool.store.entity.*;
import com.cool.store.entity.LineAuditInfoDO;
import com.cool.store.entity.LineInfoDO;
import com.cool.store.entity.LineInterviewDO;
import com.cool.store.enums.AuditResultTypeEnum; import com.cool.store.enums.AuditResultTypeEnum;
import com.cool.store.mapper.AuditStatusMapper; import com.cool.store.mapper.AuditStatusMapper;
import com.cool.store.mapper.LineInterviewMapper; 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.response.CheckListResponse;
import com.cool.store.service.AuditStatusService; import com.cool.store.service.AuditStatusService;
import com.cool.store.utils.poi.DateUtils; 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.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@@ -71,7 +65,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
if (request.getCheckStatus().equals(0)) { if (request.getCheckStatus().equals(0)) {
auditInfo.setResultType(AuditResultTypeEnum.PASS.getCode()); auditInfo.setResultType(AuditResultTypeEnum.PASS.getCode());
auditInfo.setPassReason(request.getCheckResult()); auditInfo.setPassReason(request.getCheckResult());
} else if (request.getCheckStatus().equals(1)){ } else if (request.getCheckStatus().equals(1)) {
auditInfo.setResultType(AuditResultTypeEnum.REJECT.getCode()); auditInfo.setResultType(AuditResultTypeEnum.REJECT.getCode());
auditInfo.setRejectPublicReason(request.getCheckResult()); auditInfo.setRejectPublicReason(request.getCheckResult());
auditInfo.setRejectRealReason(request.getCheckResult()); auditInfo.setRejectRealReason(request.getCheckResult());
@@ -128,7 +122,13 @@ public class AuditStatusServiceImpl implements AuditStatusService {
Integer checkStage, Integer checkStage,
Integer pageNum, Integer pageNum,
Integer pageSize) { 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<CheckListResponse> checkListResponses = auditStatusMapper.checkList(partnerNameOrPhone, startTime, endTime, region, checkStatus, checkStage, pageNum, pageSize);
//意向区域 //意向区域
List<Long> wantRegions = checkListResponses.stream().map(CheckListResponse::getWantRegion).collect(Collectors.toList()); List<Long> wantRegions = checkListResponses.stream().map(CheckListResponse::getWantRegion).collect(Collectors.toList());
@@ -143,7 +143,7 @@ public class AuditStatusServiceImpl implements AuditStatusService {
//面审人Map //面审人Map
Map<String, String> intervieweeIdMap = enterpriseUserDAO.getUserNameMap(intervieweeIds); Map<String, String> intervieweeIdMap = enterpriseUserDAO.getUserNameMap(intervieweeIds);
checkListResponses.forEach(x->{ checkListResponses.forEach(x -> {
x.setIntervieweeName(intervieweeIdMap.get(x.getIntervieweeId())); x.setIntervieweeName(intervieweeIdMap.get(x.getIntervieweeId()));
x.setWantRegionName(wantShopAreaMap.get(x.getWantRegion())); x.setWantRegionName(wantShopAreaMap.get(x.getWantRegion()));
x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId())); x.setInvestmentName(investmentIdMap.get(x.getIntervieweeId()));