From 4c63d12c473c0327ec531c7e386d8c203073af8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 30 Jun 2023 18:56:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java | 2 +- .../java/com/cool/store/mapper/HyPartnerLineInfoMapper.java | 4 ++-- .../com/cool/store/request/PrivateSeaLineListRequest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 082d15a82..a10f0a721 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -130,7 +130,7 @@ public class HyPartnerLineInfoDAO { return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentAreaName,acceptAdjustType,updateStartTime,updateEndTime,userIdList); } - public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd, + public List getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, String deadlineStart, String deadlineEnd, String intentAreaName, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List userIdList,List developmentManagerList){ return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd, intentAreaName, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index b143b1ee8..8acd80697 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -167,8 +167,8 @@ public interface HyPartnerLineInfoMapper { @Param("keywordType") String keywordType, @Param("workflowStage") String workflowStage, @Param("workflowStatus") String workflowStatus, - @Param("deadlineStart") Date deadlineStart, - @Param("deadlineEnd") Date deadlineEnd, + @Param("deadlineStart") String deadlineStart, + @Param("deadlineEnd") String deadlineEnd, @Param("intentAreaName") String intentAreaName, @Param("acceptAdjustType") Integer acceptAdjustType, @Param("storeKeyword") String storeKeyword, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java index 7684ccb2b..7322333b8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PrivateSeaLineListRequest.java @@ -29,10 +29,10 @@ public class PrivateSeaLineListRequest extends PageInfoRequest { private String workflowStatus; @ApiModelProperty("截止时间_开始") - private Date deadlineStart; + private String deadlineStart; @ApiModelProperty("截止时间_结束") - private Date deadlineEnd; + private String deadlineEnd; @ApiModelProperty("意向区域") private String intentArea;