|
@@ -7,7 +7,8 @@
|
|
|
<result column="customId" property="customId"/>
|
|
|
<result column="companyNum" property="companyNum"/>
|
|
|
<!-- <result column="tradeId" property="tradeId"/>-->
|
|
|
- <result column="fee" property="fee"/>
|
|
|
+ <result column="fee" property="fee"/>
|
|
|
+ <result column="actCalTime" property="actCalTime"/>
|
|
|
<!-- <result column="calculateTime" property="calculateTime"/>-->
|
|
|
<!-- <result column="ctype" property="ctype"/>-->
|
|
|
<result column="invoiceMkTime" property="invoiceMkTime"/>
|
|
@@ -26,7 +27,8 @@
|
|
|
invoiceMkTime,
|
|
|
companyReferencenum,
|
|
|
companyName,
|
|
|
- companyLongName
|
|
|
+ companyLongName,
|
|
|
+ actCalTime
|
|
|
</sql>
|
|
|
<select id="selectAllByPage" resultMap="BaseResultMap">
|
|
|
select
|
|
@@ -52,6 +54,9 @@
|
|
|
<if test="calculateInfor.calTime != null and calculateInfor.calTime != ''">
|
|
|
and calTime BETWEEN #{calculateInfor.calTimeStart} and #{calculateInfor.calTimeEnd}
|
|
|
</if>
|
|
|
+ <if test="calculateInfor.actCalTime != null and calculateInfor.actCalTime != ''">
|
|
|
+ and actCalTime BETWEEN #{calculateInfor.actCalTimeStart} and #{calculateInfor.actCalTimeEnd}
|
|
|
+ </if>
|
|
|
order by id DESC
|
|
|
</select>
|
|
|
<select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor">
|
|
@@ -65,10 +70,11 @@
|
|
|
companyNum,
|
|
|
etcNum,
|
|
|
fee,
|
|
|
- calTime,invoiceMkTime,companyReferencenum,companyName,companyLongName
|
|
|
+ calTime,invoiceMkTime,companyReferencenum,companyName,companyLongName,actCalTime
|
|
|
)
|
|
|
values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
|
|
|
- #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{companyLongName,jdbcType=VARCHAR}
|
|
|
+ #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},
|
|
|
+ #{companyReferencenum,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{companyLongName,jdbcType=VARCHAR},#{actCalTime,jdbcType=VARCHAR}
|
|
|
)
|
|
|
</insert>
|
|
|
<resultMap id="staticResultMap" type="java.util.Map">
|