Commit d83cb213 by zhangxingmin

push

parent 1f215e1d
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest; import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse; import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
import com.yd.csf.service.dto.ItineraryDto; //import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.Appointment; import com.yd.csf.service.model.Appointment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -23,5 +23,5 @@ public interface AppointmentMapper extends BaseMapper<Appointment> { ...@@ -23,5 +23,5 @@ public interface AppointmentMapper extends BaseMapper<Appointment> {
@Param("request") ApiAppointmentPageRequest request); @Param("request") ApiAppointmentPageRequest request);
//获取行程单的数据 //获取行程单的数据
ItineraryDto getItineraryDto(@Param("appointmentBizId") String appointmentBizId); // ItineraryDto getItineraryDto(@Param("appointmentBizId") String appointmentBizId);
} }
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest; import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse; import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
import com.yd.csf.service.dto.ItineraryDto; //import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.Appointment; import com.yd.csf.service.model.Appointment;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
...@@ -23,5 +23,5 @@ public interface IAppointmentService extends IService<Appointment> { ...@@ -23,5 +23,5 @@ public interface IAppointmentService extends IService<Appointment> {
Appointment queryOne(String appointmentBizId); Appointment queryOne(String appointmentBizId);
ItineraryDto getItineraryDto(String appointmentBizId); // ItineraryDto getItineraryDto(String appointmentBizId);
} }
...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest; import com.yd.csf.feign.request.appointment.ApiAppointmentPageRequest;
import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse; import com.yd.csf.feign.response.appointment.ApiAppointmentPageResponse;
import com.yd.csf.service.dto.ItineraryDto; //import com.yd.csf.service.dto.ItineraryDto;
import com.yd.csf.service.model.Appointment; import com.yd.csf.service.model.Appointment;
import com.yd.csf.service.dao.AppointmentMapper; import com.yd.csf.service.dao.AppointmentMapper;
import com.yd.csf.service.service.IAppointmentService; import com.yd.csf.service.service.IAppointmentService;
...@@ -45,13 +45,13 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi ...@@ -45,13 +45,13 @@ public class AppointmentServiceImpl extends ServiceImpl<AppointmentMapper, Appoi
return this.getOne(new LambdaQueryWrapper<Appointment>().eq(Appointment::getAppointmentBizId,appointmentBizId)); return this.getOne(new LambdaQueryWrapper<Appointment>().eq(Appointment::getAppointmentBizId,appointmentBizId));
} }
/** // /**
* 获取行程单的数据 // * 获取行程单的数据
* @param appointmentBizId // * @param appointmentBizId
* @return // * @return
*/ // */
public ItineraryDto getItineraryDto(String appointmentBizId){ // public ItineraryDto getItineraryDto(String appointmentBizId){
return baseMapper.getItineraryDto(appointmentBizId); // return baseMapper.getItineraryDto(appointmentBizId);
} // }
} }
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
and a.is_deleted = 0 and a.is_deleted = 0
</select> </select>
<select id="getItineraryDto" resultType="com.yd.csf.service.dto.ItineraryDto"> <!-- <select id="getItineraryDto" resultType="com.yd.csf.service.dto.ItineraryDto">
select select
a.arrival_time,a.meeting_point, a.arrival_time,a.meeting_point,
a.signing_address,a.business_represent_name1, a.signing_address,a.business_represent_name1,
...@@ -69,6 +69,6 @@ ...@@ -69,6 +69,6 @@
and a.is_deleted = 0 and a.is_deleted = 0
</where> </where>
limit 1 limit 1
</select> </select>-->
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment