Merge remote-tracking branch 'origin/dev' into dev

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -107,7 +107,7 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
                 if (list.size()==0){
                     return  ObjectRestResponse.succ();
                 }
-            }else if (companyIds.size()>0){
+            }else if (list!=null&&companyIds.size()>0){
                 list=mapper.getSiteList(null,null,companyIds);
             }
             list=mapper.getGoodList(list);
@@ -125,6 +125,10 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
         }
         return  ObjectRestResponse.succ(list);
     }
+    //获取路线核销信息
+    public ObjectRestResponse getVerification(Integer verificationId){
+        return  ObjectRestResponse.succ(mapper.getVerification(verificationId));
+    }
 
 
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

@@ -65,4 +65,7 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
 
     //获取时间列表
     List<TourVerificationInfoVo>  getSpeList(@Param("goodId")Integer goodId,@Param("siteId")Integer siteId,@Param("companyId")Integer companyId);
+
+    //获取核销路线信息
+    TourVerificationInfoVo  getVerification(@Param("verificationId")Integer verificationId);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourVerificationController.java

@@ -45,4 +45,9 @@ public class TourVerificationController extends TourBaseController<TourGoodVerif
         return baseBiz.getVerificationList(tourVerificationInfoVo);
     }
 
+    @GetMapping("/info/{id}")
+    public ObjectRestResponse getList(@PathVariable Integer id){
+        return baseBiz.getVerification(id);
+    }
+
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -48,7 +48,6 @@
     LEFT JOIN tour_good g ON v.good_id = g.id
     WHERE
         v.is_del = 0
-    AND g.`status` = 0
     <if test="list!=null and list.size != 0">
              and v.site_id  in (
              <trim suffixOverrides=",">
@@ -90,18 +89,18 @@
     <!--获取时间-->
      <select id="getSpeList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
         SELECT
-          DISTINCT
-          v.id as verificationId,
-          v.spe_id as speId,
-          p.start_time as startTime,
-          p.end_time as endTime,
+         DISTINCT
+         v.id as verificationId,
+         v.spe_id as speId,
+         p.start_time as startTime,
+         p.end_time as endTime,
          CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time
-        FROM
-            tour_good_verification v
-        LEFT JOIN  tour_good_site s   on v.site_id=s.id
-        LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
-        WHERE
-            v.is_del = 0 and v.good_id=#{goodId}
+         FROM
+         tour_good_verification v
+         LEFT JOIN  tour_good_site s   on v.site_id=s.id
+         LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
+         WHERE
+         v.is_del = 0 and v.good_id=#{goodId} and DATEDIFF(p.start_time,NOW())>0
          <if test="siteId!=null and siteId!='' ">
              and v.site_id=#{siteId}
          </if>
@@ -112,5 +111,26 @@
             p.start_time
 
      </select>
+    <!--获取核销信息-->
+    <select id="getVerification" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+        SELECT
+        DISTINCT
+        v.id as verificationId,
+        v.spe_id as speId,
+        p.start_time as startTime,
+        p.end_time as endTime,
+        CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time,
+        s.id as siteId,
+        s.name as siteName,
+        s.company_id as companyId,
+        v.good_id as goodId,
+        g.`name` as goodName
+        FROM
+        tour_good_verification v
+        LEFT JOIN  tour_good_site s   on v.site_id=s.id
+        LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
+        LEFT JOIN  tour_good g ON v.good_id=g.id
+        WHERE v.id=#{verificationId}
+    </select>
 
 </mapper>
\ No newline at end of file