修改需求

src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -167,9 +167,14 @@ public class ReleaseTravelController {
                 releaseTravelService.updateLookNum(travel);//修改查看数量
                 listTravel = releaseTravelService.getTravelID(travel);//查询游记内容
                 List<TravelExperience> list = releaseTravelService.getTravelExper(travel);
+                List<SupplierReleaseDay> listDay = privateOrderService.getSupplierReleaseDay(listTravel.getReleaseUuid());
+                System.out.println(listDay.size());
                 if(list.size() != 0){
                     listTravel.setTravelArray(list);//查询游记每天内容
                 }
+                if(listDay.size() != 0){ //判断时间是否为空
+                    listTravel.setTravelArrayRouteTime(listDay);
+                }
                 //查询收藏
                 List<OrderingConllection> list1 = releaseTravelService.getTravelConllection(travel.getUuid());
                 if(list1.size() != 0){
@@ -179,9 +184,13 @@ public class ReleaseTravelController {
                 releaseTravelService.updateLookNumRoute(travel);//修改查看数量
                 listTravel = releaseTravelService.getTravelRoute(travel);//查询供应商路线内容
                 List<SupplierReleasePlay> list = privateOrderService.getSupplierReleasePlay(travel.getUuid());
-                if(list.size() != 0){
+                List<SupplierReleaseDay> listDay = privateOrderService.getSupplierReleaseDay(travel.getUuid());
+                if(list.size() != 0){  //判断游玩是否有内容
                     listTravel.setTravelArrayRoute(list);//查询游记每天内容
                 }
+                if(listDay.size() != 0){ //判断时间是否为空
+                    listTravel.setTravelArrayRouteTime(listDay);
+                }
                 //查询收藏
                 List<OrderingConllection> list1 = releaseTravelService.getTravelConllection(travel.getUuid());
                 if(list1.size() != 0){

src/main/java/com/travel/model/Travel.java

@@ -53,6 +53,10 @@ public class Travel implements Serializable {
      * 供应商游玩信息
      */
     private List<SupplierReleasePlay> travelArrayRoute;
+    /**
+     * 供应商路线时间信息
+     */
+    private List<SupplierReleaseDay> travelArrayRouteTime;
     /**
      * 收藏
      */
@@ -193,5 +197,8 @@ public class Travel implements Serializable {
      * 结束时间
      */
     private String endTime;
-
+    /**
+     * 游记编号
+     */
+    private String travelUuid;
 }

src/main/java/com/travel/model/UsedUser.java

@@ -64,4 +64,8 @@ public class UsedUser implements Serializable {
      * 方案id  确认方案用
      */
     private String confirmUuid;
+    /**
+     * 是否是本人
+     */
+    private String isAm;
 }

src/main/resources/config/mapping/CommentsMapper.xml

@@ -45,7 +45,7 @@
             LEFT JOIN bus_supplier_route c ON a.travel_uuid = c.uuid
         WHERE
             a.code = #{code}
-            AND a.id not in (select TOP ${page} id from bus_travel_comments where code = #{code})
+            AND a.id not in (select TOP ${page} id from bus_travel_comments where code = #{code}) and b.uuid is not null
         ORDER BY a.jdrq
     </select>
     <!-- 查询个人评论条数 -->

src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -5,9 +5,9 @@
     <!-- 新增私人订制 -->
     <insert id="insertPrivate" parameterType="PrivateOrder">
         insert into
-            bus_private_ordering(code,origin,destination,start_time,end_time,people_num,jdrq,people_all,budget_min,budget_max,language,nature_type,name,email,rhythm,hotel_scale,resources_needed,flight,remarks,uuid,travel_is_no,travel_user,order_no)
+            bus_private_ordering(code,origin,destination,start_time,end_time,people_num,jdrq,people_all,budget_min,budget_max,language,nature_type,name,email,rhythm,hotel_scale,resources_needed,flight,remarks,uuid,travel_is_no,travel_user,order_no,travel_uuid)
         values
-            (#{code},#{origin},#{destination},#{startTime},#{endTime},#{peopleNum},SYSDATETIME(),#{peopleAll},#{budgetMin},#{budgetMax},#{language},#{natureType},#{name},#{email},#{rhythm},#{hotelScale},#{resourcesNeeded},#{flight},#{remarks},#{uuid},#{travelIsNo},#{travelUser},#{orderNo})
+            (#{code},#{origin},#{destination},#{startTime},#{endTime},#{peopleNum},SYSDATETIME(),#{peopleAll},#{budgetMin},#{budgetMax},#{language},#{natureType},#{name},#{email},#{rhythm},#{hotelScale},#{resourcesNeeded},#{flight},#{remarks},#{uuid},#{travelIsNo},#{travelUser},#{orderNo},#{travelUuid})
     </insert>
     <!-- 查询私人订制 -->
     <select id="getPrivate" resultType="PrivateOrder">

src/main/resources/config/mapping/UsedUserMapper.xml

@@ -8,8 +8,8 @@
     </select>
     <!-- 新增常用旅客信息 -->
     <insert id="addUsed" parameterType="UsedUser">
-        insert into sys_used_user_information(code,name,nationality,sex,phone,document_type,id_number,date_of_birth,uuid,jdrq,prefix_phone)
-        values(#{code},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},#{uuid},SYSDATETIME(),#{prefixPhone})
+        insert into sys_used_user_information(code,name,nationality,sex,phone,document_type,id_number,date_of_birth,uuid,jdrq,prefix_phone,is_am)
+        values(#{code},#{name},#{nationality},#{sex},#{phone},#{documentType},#{idNumber},#{dateOfBirth},#{uuid},SYSDATETIME(),#{prefixPhone},#{isAm})
     </insert>
     <!-- 删除常用旅客信息 -->
     <delete id="delUsed" parameterType="UsedUser">
@@ -44,6 +44,9 @@
                 <if test="prefixPhone != null and prefixPhone != ''">
                     prefix_phone=#{prefixPhone},
                 </if>
+                <if test="isAm != null and isAm != ''">
+                    is_am=#{isAm},
+                </if>
             </trim>
         </set>
         where code = #{code} and uuid = #{uuid}