Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into Jw

common/src/main/java/com/jumeirah/common/service/impl/PlainTypeServiceImpl.java

@@ -2,6 +2,7 @@ package com.jumeirah.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jumeirah.common.entity.PlainType;
+import com.jumeirah.common.enums.PlainTypeStatusEnum;
 import com.jumeirah.common.mapper.PlainTypeMapper;
 import com.jumeirah.common.service.PlainTypeService;
 import com.jumeirah.common.param.PlainTypePageParam;
@@ -65,6 +66,7 @@ public class PlainTypeServiceImpl extends BaseServiceImpl<PlainTypeMapper, Plain
     @Override
     public List<PlainType> getAllMap() {
         return this.list(new QueryWrapper<PlainType>().lambda()
+                .eq(PlainType::getStatus, PlainTypeStatusEnum.OK.getCode())
                 .orderByAsc(PlainType::getSeriesType, PlainType::getCreateTime)
         );
     }

common/src/main/resources/mapper/StrokeMapper.xml

@@ -12,7 +12,7 @@
         plain_type_id,
         outset_time,
         return_time,
-        type,
+        type,zuo
         STATUS,
         money,
         user_id,
@@ -76,11 +76,6 @@
     <select id="getStrokePageList" parameterType="com.jumeirah.common.param.StrokePageParam"
             resultType="com.jumeirah.common.vo.StrokeQueryVo">
         select
-        ctco.city_name_cn as city_outset_name,
-        ctco.airport_name_cn as outset_airport_name,
-        ctca.city_name_cn as city_arrive_name,
-        ctca.airport_name_cn as arrive_airport_name,
-        <include refid="Page_Column_List"/>
             <choose>
                 <when test="language !='zh_CN'">
                     ctco.city_name_en as city_outset_name,
@@ -116,11 +111,6 @@
     <select id="getStrokePageListWithFinish" parameterType="com.jumeirah.common.param.StrokePageParam"
             resultType="com.jumeirah.common.vo.StrokeQueryVo">
         select
-        ctco.city_name_cn as city_outset_name,
-        ctco.airport_name_cn as outset_airport_name,
-        ctca.city_name_cn as city_arrive_name,
-        ctca.airport_name_cn as arrive_airport_name,
-        <include refid="Page_Column_List"/>
             <choose>
                 <when test="language !='zh_CN'">
                     ctco.city_name_en as city_outset_name,
@@ -151,14 +141,6 @@
     <select id="getMcStrokePageList" parameterType="com.jumeirah.common.param.McStrokePageParam"
             resultType="com.jumeirah.common.vo.McStrokeQueryVo">
         SELECT
-        s.*,
-        ctco.city_name_cn as city_outset_name,
-        ctco.airport_name_cn as outset_airport_name,
-        ctca.city_name_cn as city_arrive_name,
-        ctca.airport_name_cn as arrive_airport_name,
-        CONCAT( au.surname, au.`name` ) AS applicant,
-        pt.name AS plain_type_name,
-        au.phone AS phone_number
             s.id,
             s.city_outset_id,
             s.deleted,
@@ -226,33 +208,6 @@
                     AND s.create_time &lt;= #{mcStrokePageParam.endTime}
                 </if>
                 <if test="mcStrokePageParam.applicant != null and mcStrokePageParam.applicant != ''">
-                AND CONCAT( au.surname, au.`name` ) LIKE CONCAT('%',#{mcStrokePageParam.applicant},'%')
-            </if>
-        </where>
-        ORDER BY s.create_time DESC
-            stroke s
-            LEFT JOIN app_user au ON au.id = s.user_id
-            LEFT JOIN plain_type pt ON pt.id = s.plain_type_id
-            INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
-            INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
-            <where>
-                s.mc_id = #{mcId}
-                <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
-                    AND s.status = #{mcStrokePageParam.status}
-                </if>
-                <if test="mcStrokePageParam.type != null and mcStrokePageParam.type != -1">
-                    AND s.type = #{mcStrokePageParam.type}
-                </if>
-                <if test="mcStrokePageParam.id != null and mcStrokePageParam.id != 0">
-                    AND s.id = #{mcStrokePageParam.id}
-                </if>
-                <if test="mcStrokePageParam.startTime != null and mcStrokePageParam.startTime != ''">
-                    AND s.create_time &gt;= #{mcStrokePageParam.startTime}
-                </if>
-                <if test="mcStrokePageParam.endTime != null and mcStrokePageParam.endTime != ''">
-                    AND s.create_time &lt;= #{mcStrokePageParam.endTime}
-                </if>
-                <if test="mcStrokePageParam.applicant != null and mcStrokePageParam.applicant != ''">
                     AND CONCAT( au.surname, au.`name`) LIKE CONCAT('%',#{mcStrokePageParam.applicant},'%')
                 </if>
             </where>