autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-16 07:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
BOOL\25024
2023-08-14 15:44:42 +08:00
parent 08da5ea9f8 29bc57f228
commit e4b04c4462
2 changed files with 903 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

375
jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
View File

@@ -4,57 +4,72 @@
<resultMap id="BaseResultMap" type="com.jsowell.pile.domain.SettleOrderReport"> <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.SettleOrderReport">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table settle_order_report--> <!--@Table settle_order_report-->
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id"/>
<result column="merchant_id" jdbcType="VARCHAR" property="merchantId" /> <result column="merchant_id" jdbcType="VARCHAR" property="merchantId"/>
<result column="station_id" jdbcType="VARCHAR" property="stationId" /> <result column="station_id" jdbcType="VARCHAR" property="stationId"/>
<result column="order_codes" jdbcType="LONGVARCHAR" property="orderCodes" /> <result column="order_codes" jdbcType="LONGVARCHAR" property="orderCodes"/>
<result column="use_electricity" jdbcType="DECIMAL" property="useElectricity" /> <result column="use_electricity" jdbcType="DECIMAL" property="useElectricity"/>
<result column="charge_num" jdbcType="VARCHAR" property="chargeNum" /> <result column="charge_num" jdbcType="VARCHAR" property="chargeNum"/>
<result column="charge_time" jdbcType="VARCHAR" property="chargeTime" /> <result column="charge_time" jdbcType="VARCHAR" property="chargeTime"/>
<result column="electricity_amount" jdbcType="DECIMAL" property="electricityAmount" /> <result column="electricity_amount" jdbcType="DECIMAL" property="electricityAmount"/>
<result column="service_amount" jdbcType="DECIMAL" property="serviceAmount" /> <result column="service_amount" jdbcType="DECIMAL" property="serviceAmount"/>
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" /> <result column="total_amount" jdbcType="DECIMAL" property="totalAmount"/>
<result column="virtual_amount" jdbcType="DECIMAL" property="virtualAmount" /> <result column="virtual_amount" jdbcType="DECIMAL" property="virtualAmount"/>
<result column="trade_date" jdbcType="VARCHAR" property="tradeDate" /> <result column="trade_date" jdbcType="VARCHAR" property="tradeDate"/>
<result column="trade_amount" jdbcType="DECIMAL" property="tradeAmount" /> <result column="trade_amount" jdbcType="DECIMAL" property="tradeAmount"/>
<result column="trade_fee" jdbcType="DECIMAL" property="tradeFee" /> <result column="trade_fee" jdbcType="DECIMAL" property="tradeFee"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="del_flag" jdbcType="VARCHAR" property="delFlag" /> <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, merchant_id, station_id, order_codes, use_electricity, charge_num, charge_time, id,
electricity_amount, service_amount, total_amount, virtual_amount, trade_date, trade_amount, merchant_id,
trade_fee, create_time, del_flag station_id,
order_codes,
use_electricity,
charge_num,
charge_time,
electricity_amount,
service_amount,
total_amount,
virtual_amount,
trade_date,
trade_amount,
trade_fee,
create_time,
del_flag
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated--> <!--@mbg.generated-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from settle_order_report from settle_order_report
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated--> <!--@mbg.generated-->
delete from settle_order_report delete
from settle_order_report
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true"> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.SettleOrderReport"
useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into settle_order_report (merchant_id, station_id, order_codes, insert into settle_order_report (merchant_id, station_id, order_codes,
use_electricity, charge_num, charge_time, use_electricity, charge_num, charge_time,
electricity_amount, service_amount, total_amount, electricity_amount, service_amount, total_amount,
virtual_amount, trade_date, trade_amount, virtual_amount, trade_date, trade_amount,
trade_fee, create_time, del_flag trade_fee, create_time, del_flag)
)
values (#{merchantId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{orderCodes,jdbcType=LONGVARCHAR}, values (#{merchantId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{orderCodes,jdbcType=LONGVARCHAR},
#{useElectricity,jdbcType=DECIMAL}, #{chargeNum,jdbcType=VARCHAR}, #{chargeTime,jdbcType=VARCHAR}, #{useElectricity,jdbcType=DECIMAL}, #{chargeNum,jdbcType=VARCHAR}, #{chargeTime,jdbcType=VARCHAR},
#{electricityAmount,jdbcType=DECIMAL}, #{serviceAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{electricityAmount,jdbcType=DECIMAL}, #{serviceAmount,jdbcType=DECIMAL},
#{totalAmount,jdbcType=DECIMAL},
#{virtualAmount,jdbcType=DECIMAL}, #{tradeDate,jdbcType=VARCHAR}, #{tradeAmount,jdbcType=DECIMAL}, #{virtualAmount,jdbcType=DECIMAL}, #{tradeDate,jdbcType=VARCHAR}, #{tradeAmount,jdbcType=DECIMAL},
#{tradeFee,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR} #{tradeFee,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR})
)
</insert> </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="id"
parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into settle_order_report insert into settle_order_report
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -432,15 +447,20 @@
trade_fee, create_time, del_flag) trade_fee, create_time, del_flag)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.orderCodes,jdbcType=LONGVARCHAR}, (#{item.merchantId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR},
#{item.useElectricity,jdbcType=DECIMAL}, #{item.chargeNum,jdbcType=VARCHAR}, #{item.chargeTime,jdbcType=VARCHAR}, #{item.orderCodes,jdbcType=LONGVARCHAR},
#{item.useElectricity,jdbcType=DECIMAL}, #{item.chargeNum,jdbcType=VARCHAR},
#{item.chargeTime,jdbcType=VARCHAR},
#{item.electricityAmount,jdbcType=DECIMAL}, #{item.serviceAmount,jdbcType=DECIMAL}, #{item.electricityAmount,jdbcType=DECIMAL}, #{item.serviceAmount,jdbcType=DECIMAL},
#{item.totalAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL}, #{item.tradeDate,jdbcType=VARCHAR}, #{item.totalAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL},
#{item.tradeAmount,jdbcType=DECIMAL}, #{item.tradeFee,jdbcType=DECIMAL}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.tradeDate,jdbcType=VARCHAR},
#{item.tradeAmount,jdbcType=DECIMAL}, #{item.tradeFee,jdbcType=DECIMAL},
#{item.createTime,jdbcType=TIMESTAMP},
#{item.delFlag,jdbcType=VARCHAR}) #{item.delFlag,jdbcType=VARCHAR})
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true"> <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"
parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into settle_order_report insert into settle_order_report
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -500,7 +520,8 @@
trade_fee = #{tradeFee,jdbcType=DECIMAL}, trade_fee = #{tradeFee,jdbcType=DECIMAL},
</trim> </trim>
</insert> </insert>
<insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true"> <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
parameterType="com.jsowell.pile.domain.SettleOrderReport" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into settle_order_report insert into settle_order_report
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -658,21 +679,21 @@
</insert> </insert>
<resultMap id="SettleOrderReportResult" type="com.jsowell.pile.domain.SettleOrderReport"> <resultMap id="SettleOrderReportResult" type="com.jsowell.pile.domain.SettleOrderReport">
<result column="id" property="id" /> <result column="id" property="id"/>
<result column="merchant_id" property="merchantId" /> <result column="merchant_id" property="merchantId"/>
<result column="station_id" property="stationId" /> <result column="station_id" property="stationId"/>
<result column="use_electricity" property="useElectricity" /> <result column="use_electricity" property="useElectricity"/>
<result column="charge_num" property="chargeNum" /> <result column="charge_num" property="chargeNum"/>
<result column="charge_time" property="chargeTime" /> <result column="charge_time" property="chargeTime"/>
<result column="electricity_amount" property="electricityAmount" /> <result column="electricity_amount" property="electricityAmount"/>
<result column="service_amount" property="serviceAmount" /> <result column="service_amount" property="serviceAmount"/>
<result column="total_amount" property="totalAmount" /> <result column="total_amount" property="totalAmount"/>
<result column="virtual_amount" property="virtualAmount" /> <result column="virtual_amount" property="virtualAmount"/>
<result column="trade_date" property="tradeDate" /> <result column="trade_date" property="tradeDate"/>
<result column="trade_amount" property="tradeAmount" /> <result column="trade_amount" property="tradeAmount"/>
<result column="trade_fee" property="tradeFee" /> <result column="trade_fee" property="tradeFee"/>
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime"/>
<result column="del_flag" property="delFlag" /> <result column="del_flag" property="delFlag"/>
</resultMap> </resultMap>
<sql id="selectSettleOrderReportVo"> <sql id="selectSettleOrderReportVo">
@@ -681,103 +702,218 @@
from settle_order_report from settle_order_report
</sql> </sql>
<select id="selectSettleOrderReportList" parameterType="com.jsowell.pile.domain.SettleOrderReport" resultMap="SettleOrderReportResult"> <select id="selectSettleOrderReportList" parameterType="com.jsowell.pile.domain.SettleOrderReport"
<include refid="selectSettleOrderReportVo" /> resultMap="SettleOrderReportResult">
<include refid="selectSettleOrderReportVo"/>
<where> <where>
<if test="merchantId != null and merchantId != ''"> and merchant_id = #{merchantId}</if> <if test="merchantId != null and merchantId != ''">
<if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if> and merchant_id = #{merchantId}
<if test="useElectricity != null "> and use_electricity = #{useElectricity}</if> </if>
<if test="chargeNum != null and chargeNum != ''"> and charge_num = #{chargeNum}</if> <if test="stationId != null and stationId != ''">
<if test="chargeTime != null and chargeTime != ''"> and charge_time = #{chargeTime}</if> and station_id = #{stationId}
<if test="electricityAmount != null "> and electricity_amount = #{electricityAmount}</if> </if>
<if test="serviceAmount != null "> and service_amount = #{serviceAmount}</if> <if test="useElectricity != null">
<if test="totalAmount != null "> and total_amount = #{totalAmount}</if> and use_electricity = #{useElectricity}
<if test="virtualAmount != null "> and virtual_amount = #{virtualAmount}</if> </if>
<if test="tradeDate != null and tradeDate != ''"> and trade_date = #{tradeDate}</if> <if test="chargeNum != null and chargeNum != ''">
<if test="tradeAmount != null "> and trade_amount = #{tradeAmount}</if> and charge_num = #{chargeNum}
<if test="tradeFee != null "> and trade_fee = #{tradeFee}</if> </if>
<if test="chargeTime != null and chargeTime != ''">
and charge_time = #{chargeTime}
</if>
<if test="electricityAmount != null">
and electricity_amount = #{electricityAmount}
</if>
<if test="serviceAmount != null">
and service_amount = #{serviceAmount}
</if>
<if test="totalAmount != null">
and total_amount = #{totalAmount}
</if>
<if test="virtualAmount != null">
and virtual_amount = #{virtualAmount}
</if>
<if test="tradeDate != null and tradeDate != ''">
and trade_date = #{tradeDate}
</if>
<if test="tradeAmount != null">
and trade_amount = #{tradeAmount}
</if>
<if test="tradeFee != null">
and trade_fee = #{tradeFee}
</if>
</where> </where>
order by trade_date DESC order by trade_date DESC
</select> </select>
<select id="selectSettleOrderReportById" parameterType="Long" resultMap="SettleOrderReportResult"> <select id="selectSettleOrderReportById" parameterType="Long" resultMap="SettleOrderReportResult">
<include refid="selectSettleOrderReportVo" /> <include refid="selectSettleOrderReportVo"/>
where id = #{id} where id = #{id}
</select> </select>
<insert id="insertSettleOrderReport" parameterType="com.jsowell.pile.domain.SettleOrderReport"> <insert id="insertSettleOrderReport" parameterType="com.jsowell.pile.domain.SettleOrderReport">
insert into settle_order_report insert into settle_order_report
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">
<if test="merchantId != null">merchant_id,</if> id,
<if test="stationId != null">station_id,</if> </if>
<if test="useElectricity != null">use_electricity,</if> <if test="merchantId != null">
<if test="chargeNum != null">charge_num,</if> merchant_id,
<if test="chargeTime != null">charge_time,</if> </if>
<if test="electricityAmount != null">electricity_amount,</if> <if test="stationId != null">
<if test="serviceAmount != null">service_amount,</if> station_id,
<if test="totalAmount != null">total_amount,</if> </if>
<if test="virtualAmount != null">virtual_amount,</if> <if test="useElectricity != null">
<if test="tradeDate != null">trade_date,</if> use_electricity,
<if test="tradeAmount != null">trade_amount,</if> </if>
<if test="tradeFee != null">trade_fee,</if> <if test="chargeNum != null">
<if test="createTime != null">create_time,</if> charge_num,
<if test="delFlag != null">del_flag,</if> </if>
<if test="chargeTime != null">
charge_time,
</if>
<if test="electricityAmount != null">
electricity_amount,
</if>
<if test="serviceAmount != null">
service_amount,
</if>
<if test="totalAmount != null">
total_amount,
</if>
<if test="virtualAmount != null">
virtual_amount,
</if>
<if test="tradeDate != null">
trade_date,
</if>
<if test="tradeAmount != null">
trade_amount,
</if>
<if test="tradeFee != null">
trade_fee,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="delFlag != null">
del_flag,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if> <if test="id != null">
<if test="merchantId != null">#{merchantId},</if> #{id},
<if test="stationId != null">#{stationId},</if> </if>
<if test="useElectricity != null">#{useElectricity},</if> <if test="merchantId != null">
<if test="chargeNum != null">#{chargeNum},</if> #{merchantId},
<if test="chargeTime != null">#{chargeTime},</if> </if>
<if test="electricityAmount != null">#{electricityAmount},</if> <if test="stationId != null">
<if test="serviceAmount != null">#{serviceAmount},</if> #{stationId},
<if test="totalAmount != null">#{totalAmount},</if> </if>
<if test="virtualAmount != null">#{virtualAmount},</if> <if test="useElectricity != null">
<if test="tradeDate != null">#{tradeDate},</if> #{useElectricity},
<if test="tradeAmount != null">#{tradeAmount},</if> </if>
<if test="tradeFee != null">#{tradeFee},</if> <if test="chargeNum != null">
<if test="createTime != null">#{createTime},</if> #{chargeNum},
<if test="delFlag != null">#{delFlag},</if> </if>
<if test="chargeTime != null">
#{chargeTime},
</if>
<if test="electricityAmount != null">
#{electricityAmount},
</if>
<if test="serviceAmount != null">
#{serviceAmount},
</if>
<if test="totalAmount != null">
#{totalAmount},
</if>
<if test="virtualAmount != null">
#{virtualAmount},
</if>
<if test="tradeDate != null">
#{tradeDate},
</if>
<if test="tradeAmount != null">
#{tradeAmount},
</if>
<if test="tradeFee != null">
#{tradeFee},
</if>
<if test="createTime != null">
#{createTime},
</if>
<if test="delFlag != null">
#{delFlag},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateSettleOrderReport" parameterType="com.jsowell.pile.domain.SettleOrderReport"> <update id="updateSettleOrderReport" parameterType="com.jsowell.pile.domain.SettleOrderReport">
update settle_order_report update settle_order_report
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="merchantId != null">merchant_id = #{merchantId},</if> <if test="merchantId != null">
<if test="stationId != null">station_id = #{stationId},</if> merchant_id = #{merchantId},
<if test="useElectricity != null">use_electricity = #{useElectricity},</if> </if>
<if test="chargeNum != null">charge_num = #{chargeNum},</if> <if test="stationId != null">
<if test="chargeTime != null">charge_time = #{chargeTime},</if> station_id = #{stationId},
<if test="electricityAmount != null">electricity_amount = #{electricityAmount},</if> </if>
<if test="serviceAmount != null">service_amount = #{serviceAmount},</if> <if test="useElectricity != null">
<if test="totalAmount != null">total_amount = #{totalAmount},</if> use_electricity = #{useElectricity},
<if test="virtualAmount != null">virtual_amount = #{virtualAmount},</if> </if>
<if test="tradeDate != null">trade_date = #{tradeDate},</if> <if test="chargeNum != null">
<if test="tradeAmount != null">trade_amount = #{tradeAmount},</if> charge_num = #{chargeNum},
<if test="tradeFee != null">trade_fee = #{tradeFee},</if> </if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="chargeTime != null">
<if test="delFlag != null">del_flag = #{delFlag},</if> charge_time = #{chargeTime},
</if>
<if test="electricityAmount != null">
electricity_amount = #{electricityAmount},
</if>
<if test="serviceAmount != null">
service_amount = #{serviceAmount},
</if>
<if test="totalAmount != null">
total_amount = #{totalAmount},
</if>
<if test="virtualAmount != null">
virtual_amount = #{virtualAmount},
</if>
<if test="tradeDate != null">
trade_date = #{tradeDate},
</if>
<if test="tradeAmount != null">
trade_amount = #{tradeAmount},
</if>
<if test="tradeFee != null">
trade_fee = #{tradeFee},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="delFlag != null">
del_flag = #{delFlag},
</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>
<delete id="deleteSettleOrderReportById" parameterType="Long"> <delete id="deleteSettleOrderReportById" parameterType="Long">
delete from settle_order_report where id = #{id} delete
from settle_order_report
where id = #{id}
</delete> </delete>
<delete id="deleteSettleOrderReportByIds" parameterType="String"> <delete id="deleteSettleOrderReportByIds" parameterType="String">
delete from settle_order_report where id in delete
from settle_order_report where id in
<foreach close=")" collection="array" item="id" open="(" separator=","> <foreach close=")" collection="array" item="id" open="(" separator=",">
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<select id="getMerchantOrderReport" resultType="com.jsowell.pile.vo.web.SettleOrderReportVO"> <select id="getMerchantOrderReport" resultType="com.jsowell.pile.vo.web.SettleOrderReportVO">
select select t1.id,
t1.id,
t1.merchant_id as merchantId, t1.merchant_id as merchantId,
t1.station_id as stationId, t1.station_id as stationId,
t2.station_name as stationName, t2.station_name as stationName,
@@ -791,10 +927,9 @@
t1.trade_date as tradeDate, t1.trade_date as tradeDate,
t1.trade_amount as tradeAmount, t1.trade_amount as tradeAmount,
t1.trade_fee as tradeFee t1.trade_fee as tradeFee
from from settle_order_report t1
settle_order_report t1 join pile_station_info t2 on t1.station_id = t2.id join pile_station_info t2 on t1.station_id = t2.id
where where t1.del_flag = '0'
t1.del_flag = '0'
<if test="dto.merchantId != null and dto.merchantId != ''"> <if test="dto.merchantId != null and dto.merchantId != ''">
and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR} and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}
</if> </if>
@@ -809,7 +944,7 @@
<select id="selectByStationIdAndDate" resultMap="BaseResultMap"> <select id="selectByStationIdAndDate" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from settle_order_report from settle_order_report
where del_flag = '0' where del_flag = '0'
and station_id = #{stationId,jdbcType=VARCHAR} and station_id = #{stationId,jdbcType=VARCHAR}
@@ -818,7 +953,7 @@
<select id="selectByMerchantIdAndDate" resultMap="BaseResultMap"> <select id="selectByMerchantIdAndDate" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from settle_order_report from settle_order_report
where del_flag = '0' where del_flag = '0'
and merchant_id = #{merchantId,jdbcType=VARCHAR} and merchant_id = #{merchantId,jdbcType=VARCHAR}
@@ -827,13 +962,15 @@
<select id="queryOrderReport" resultMap="BaseResultMap"> <select id="queryOrderReport" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from settle_order_report from settle_order_report
where del_flag = '0' where del_flag = '0'
<if test="stationIdList != null and stationIdList.size() != 0">
and station_id in and station_id in
<foreach collection="stationIdList" item="stationId" open="(" separator="," close=")"> <foreach collection="stationIdList" item="stationId" open="(" separator="," close=")">
#{stationId,jdbcType=VARCHAR} #{stationId,jdbcType=VARCHAR}
</foreach> </foreach>
</if>
and trade_date between #{startDate,jdbcType=VARCHAR} and #{endDate,jdbcType=VARCHAR} and trade_date between #{startDate,jdbcType=VARCHAR} and #{endDate,jdbcType=VARCHAR}
</select> </select>
</mapper> </mapper>

13
jsowell-ui/src/views/pile/basic/detail.vue
View File

@@ -67,7 +67,13 @@
size="medium" size="medium"
clearable clearable
:disabled="clearableFlag" :disabled="clearableFlag"
type="number"
:min="1"
oninput="if(value<1)value=''"
> >
<template slot="suffix">
号桩
</template>
<template slot="append"> <template slot="append">
<el-button <el-button
type="text" type="text"
@@ -579,4 +585,11 @@ export default {
border-color: #fff; border-color: #fff;
color: #606266; color: #606266;
} }
::v-deep input::-webkit-outer-spin-button,
::v-deep input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
::v-deep input[type='number'] {
-moz-appearance: textfield !important;
}
</style> </style>