Skip to content

S
SiEn
Commit f4e04eed by lpx
Options

# 代码合并错误问题修复

parent a17c2b87
Showing with 12 additions and 55 deletions
common/src/main/java/com/jumeirah/common/service/impl/PlainTypeServiceImpl.java
...@@ -2,6 +2,7 @@ package com.jumeirah.common.service.impl; ...@@ -2,6 +2,7 @@ package com.jumeirah.common.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jumeirah.common.entity.PlainType; import com.jumeirah.common.entity.PlainType;
import com.jumeirah.common.enums.PlainTypeStatusEnum;
import com.jumeirah.common.mapper.PlainTypeMapper; import com.jumeirah.common.mapper.PlainTypeMapper;
import com.jumeirah.common.service.PlainTypeService; import com.jumeirah.common.service.PlainTypeService;
import com.jumeirah.common.param.PlainTypePageParam; import com.jumeirah.common.param.PlainTypePageParam;
...@@ -65,6 +66,7 @@ public class PlainTypeServiceImpl extends BaseServiceImpl<PlainTypeMapper, Plain ...@@ -65,6 +66,7 @@ public class PlainTypeServiceImpl extends BaseServiceImpl<PlainTypeMapper, Plain
@Override @Override
public List<PlainType> getAllMap() { public List<PlainType> getAllMap() {
return this.list(new QueryWrapper<PlainType>().lambda() return this.list(new QueryWrapper<PlainType>().lambda()
.eq(PlainType::getStatus, PlainTypeStatusEnum.OK.getCode())
.orderByAsc(PlainType::getSeriesType, PlainType::getCreateTime) .orderByAsc(PlainType::getSeriesType, PlainType::getCreateTime)
); );
} }
......
common/src/main/resources/mapper/StrokeMapper.xml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
plain_type_id, plain_type_id,
outset_time, outset_time,
return_time, return_time,
type, type,zuo
STATUS, STATUS,
money, money,
user_id, user_id,
...@@ -76,11 +76,6 @@ ...@@ -76,11 +76,6 @@
<select id="getStrokePageList" parameterType="com.jumeirah.common.param.StrokePageParam" <select id="getStrokePageList" parameterType="com.jumeirah.common.param.StrokePageParam"
resultType="com.jumeirah.common.vo.StrokeQueryVo"> resultType="com.jumeirah.common.vo.StrokeQueryVo">
select 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> <choose>
<when test="language !='zh_CN'"> <when test="language !='zh_CN'">
ctco.city_name_en as city_outset_name, ctco.city_name_en as city_outset_name,
...@@ -116,11 +111,6 @@ ...@@ -116,11 +111,6 @@
<select id="getStrokePageListWithFinish" parameterType="com.jumeirah.common.param.StrokePageParam" <select id="getStrokePageListWithFinish" parameterType="com.jumeirah.common.param.StrokePageParam"
resultType="com.jumeirah.common.vo.StrokeQueryVo"> resultType="com.jumeirah.common.vo.StrokeQueryVo">
select 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> <choose>
<when test="language !='zh_CN'"> <when test="language !='zh_CN'">
ctco.city_name_en as city_outset_name, ctco.city_name_en as city_outset_name,
...@@ -151,14 +141,6 @@ ...@@ -151,14 +141,6 @@
<select id="getMcStrokePageList" parameterType="com.jumeirah.common.param.McStrokePageParam" <select id="getMcStrokePageList" parameterType="com.jumeirah.common.param.McStrokePageParam"
resultType="com.jumeirah.common.vo.McStrokeQueryVo"> resultType="com.jumeirah.common.vo.McStrokeQueryVo">
SELECT 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.id,
s.city_outset_id, s.city_outset_id,
s.deleted, s.deleted,
...@@ -203,33 +185,6 @@ ...@@ -203,33 +185,6 @@
pt.name AS plain_type_name, pt.name AS plain_type_name,
au.phone AS phone_number au.phone AS phone_number
FROM FROM
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>
ORDER BY s.create_time DESC
stroke s stroke s
LEFT JOIN app_user au ON au.id = s.user_id LEFT JOIN app_user au ON au.id = s.user_id
LEFT JOIN plain_type pt ON pt.id = s.plain_type_id LEFT JOIN plain_type pt ON pt.id = s.plain_type_id
...@@ -262,16 +217,16 @@ ...@@ -262,16 +217,16 @@
<select id="getPaymentPageList" parameterType="com.jumeirah.common.param.McStrokePaymentPageParam" <select id="getPaymentPageList" parameterType="com.jumeirah.common.param.McStrokePaymentPageParam"
resultType="com.jumeirah.common.vo.McStrokePaymentQueryVo"> resultType="com.jumeirah.common.vo.McStrokePaymentQueryVo">
SELECT SELECT
s.id, s.id,
s.type, s.type,
s.user_recharge_time, s.user_recharge_time,
s.payment_status, s.payment_status,
s.user_recharge_money, s.user_recharge_money,
s.payment_channel, s.payment_channel,
CONCAT( au.surname, au.`name` ) AS applicant, CONCAT( au.surname, au.`name` ) AS applicant,
au.phone AS phone_number au.phone AS phone_number
FROM FROM
stroke s stroke s
LEFT JOIN app_user au ON au.id = s.user_id LEFT JOIN app_user au ON au.id = s.user_id
<where> <where>
s.mc_id = #{mcId} s.mc_id = #{mcId}
......
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