1.添加返回字段

cjy-project/src/main/java/com/cjy/appointmentteamdata/domain/AppointmentTeamData.java

@@ -55,6 +55,16 @@ public class AppointmentTeamData extends BaseEntity
     /** 机构编码 */
     @Excel(name = "机构编码")
     private Long organCode;
+    private String scenicName;
+
+    public String getScenicName() {
+        return scenicName;
+    }
+
+    public void setScenicName(String scenicName) {
+        this.scenicName = scenicName;
+    }
+
     List<AppointmentPeopleInfo> newList = new ArrayList<>();
 
     public List<AppointmentPeopleInfo> getNewList() {

cjy-project/src/main/resources/mapper/appointmentteamdata/AppointmentTeamDataMapper.xml

@@ -24,19 +24,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectAppointmentTeamDataList" parameterType="AppointmentTeamData" resultMap="AppointmentTeamDataResult">
-        <include refid="selectAppointmentTeamDataVo"/>
+        select t1.id, t1.scenic_code, t1.appointment_date, t1.appointment_slot, t1.appointment_people_name, t1.appointment_people_phone,
+        t1.appointment_people_count, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.organ_code,t2.resource_name as scenicName
+        from appointment_team_data t1
+        left join  b_tour_info t2 on t1.scenic_code = t2.resource_code
         <where>  
-            <if test="scenicCode != null  and scenicCode != ''"> and scenic_code = #{scenicCode}</if>
-            <if test="appointmentDate != null "> and appointment_date = #{appointmentDate}</if>
-            <if test="appointmentSlot != null  and appointmentSlot != ''"> and appointment_slot like concat('%', #{appointmentSlot}, '%')  </if>
-            <if test="appointmentPeopleName != null  and appointmentPeopleName != ''"> and appointment_people_name like concat('%', #{appointmentPeopleName}, '%')  </if>
-            <if test="appointmentPeoplePhone != null  and appointmentPeoplePhone != ''"> and appointment_people_phone like concat('%', #{appointmentPeoplePhone}, '%') </if>
-            <if test="appointmentPeopleCount != null  and appointmentPeopleCount != ''"> and appointment_people_count = #{appointmentPeopleCount}</if>
-            <if test="organCode != null "> and organ_code = #{organCode}</if>
-            <if test="createBy != null "> and create_by = #{createBy}</if>
-            and del_flag!=2
+            <if test="scenicCode != null  and scenicCode != ''"> and t1.scenic_code = #{scenicCode}</if>
+            <if test="appointmentDate != null "> and t1.appointment_date = #{appointmentDate}</if>
+            <if test="appointmentSlot != null  and appointmentSlot != ''"> and t1.appointment_slot like concat('%', #{appointmentSlot}, '%')  </if>
+            <if test="appointmentPeopleName != null  and appointmentPeopleName != ''"> and t1.appointment_people_name like concat('%', #{appointmentPeopleName}, '%')  </if>
+            <if test="appointmentPeoplePhone != null  and appointmentPeoplePhone != ''"> and t1.appointment_people_phone like concat('%', #{appointmentPeoplePhone}, '%') </if>
+            <if test="appointmentPeopleCount != null  and appointmentPeopleCount != ''"> and t1.appointment_people_count = #{appointmentPeopleCount}</if>
+            <if test="organCode != null "> and t1.organ_code = #{organCode}</if>
+            <if test="createBy != null "> and t1.create_by = #{createBy}</if>
+            and t1.del_flag!=2
         </where>
-        order by create_time desc
+        order by t1.create_time desc
     </select>
     
     <select id="selectAppointmentTeamDataById" parameterType="Long" resultMap="AppointmentTeamDataResult">