diff --git a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml index 119425cf8..23928820f 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} - and l.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{areaPath}, '%')) + and l.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{region}, '%')) 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 c930a03ab..96b40bfd6 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 @@ -98,11 +98,16 @@ public class AuditStatusServiceImpl implements AuditStatusService { LineInterviewDO lineInterviewDO = lineInterviewMapper.selectByPrimaryKey(auditStatusDO.getInterviewId()); LineAuditInfoDO auditInfo = lineAuditInfoDAO.getAuditInfo(auditStatusDO.getAuditId()); response.setVideoUrl(JSONObject.parseArray(lineInterviewDO.getVideoUrl(), String.class)); - - response.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualStartTime())); - response.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualEndTime())); + if (Objects.nonNull(lineInterviewDO.getActualStartTime())){ + response.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualStartTime())); + } + if (Objects.nonNull(lineInterviewDO.getActualEndTime())){ + response.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lineInterviewDO.getActualEndTime())); + } + if (Objects.nonNull(auditStatusDO.getCreateTime())){ + response.setCheckTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, auditStatusDO.getCreateTime())); + } response.setCheckUser(auditStatusDO.getAuditUserName()); - response.setCheckTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, auditStatusDO.getCreateTime())); response.setCheckStatus(auditStatusDO.getAuditStatus()); if (auditInfo.getResultType() > 0) { response.setCheckResult(auditInfo.getRejectPublicReason());