From 4def584a0aaf131bf06b7354466bd6886792142b Mon Sep 17 00:00:00 2001 From: lyf66 Date: Fri, 8 Aug 2025 14:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=B2=A1=E6=9C=89=E6=B8=85?= =?UTF-8?q?=E7=90=86=E5=B9=B2=E5=87=80=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/autocall/AutoCallApiService.java | 61 +------------------ 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/src/main/java/com/whdc/service/autocall/AutoCallApiService.java b/src/main/java/com/whdc/service/autocall/AutoCallApiService.java index a6d6bcc..85f77b7 100644 --- a/src/main/java/com/whdc/service/autocall/AutoCallApiService.java +++ b/src/main/java/com/whdc/service/autocall/AutoCallApiService.java @@ -28,7 +28,6 @@ import com.whdc.model.dto.AutoCallDto; import com.whdc.model.autocall.AutoCall; import com.whdc.model.autocall.AutoCallPerson; import com.whdc.model.autocall.AutoCallTask; -import com.whdc.model.entity.WarnCallMap; import com.whdc.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -54,8 +53,6 @@ import java.util.List; public class AutoCallApiService { @Autowired private AutoCallMapper autoCallMapper; - @Autowired - private WarnCallMapMapper warnCallMapMapper; private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @@ -130,63 +127,7 @@ public class AutoCallApiService { return pageResult; } - public Page page(AutoCallDto dto) { - Date stm = null; - Date etm = null; - try { - if (dto.getStm() != null && dto.getEtm() != null) { - stm = DateUtils.formatD(dto.getStm(), DateUtils.DATE_PATTERN1); - etm = DateUtils.formatD(dto.getEtm(), DateUtils.DATE_PATTERN1); - } - } catch (ParseException e) { - throw new RuntimeException(e); - } - if (stm != null) stm = DateUtils.standardize(stm, true); - if (etm != null) etm = DateUtils.standardize(etm, false); - - QueryWrapper query = new QueryWrapper() - .eq("should_generate", 1) - .orderByDesc("id") - .between("warn_tm", stm, etm); - if (dto.getCallIsPut() != null) { - if (dto.getCallIsPut()) { - query.eq("call_is_put", 1); - } else { - query.eq("call_is_put", 0); - } - } - Page pageParam = dto.getPage().getPage(); - Page pageResult = warnCallMapMapper.selectPage( - pageParam, - query - ); - List records = pageResult.getRecords(); - if (records.size() > 0) { - for (WarnCallMap record : records) { - Integer wcmId = record.getId(); - List autoCallList = autoCallMapper.selectList( - new QueryWrapper() - .eq("wcm_id", wcmId) - ); - record.setCallList(autoCallList); - } - } - return pageResult; - } - - public List listCallIsNotPut() { - List wcmList = warnCallMapMapper.listCallIsNotPutWcm(); - for (WarnCallMap record : wcmList) { - Integer wcmId = record.getId(); - List autoCallList = autoCallMapper.selectList( - new QueryWrapper() - .eq("wcm_id", wcmId) - ); - record.setCallList(autoCallList); - } - return wcmList; - } - @Autowired + @Autowired private AutoCallTaskMapper taskMapper; @Autowired private AutoCallPersonMapper personMapper;