|
@@ -14,6 +14,7 @@
|
|
|
<result column="start_time_" property="startTime"/>
|
|
|
<result column="end_time_" property="endTime"/>
|
|
|
<result column="order_id_" property="organId"/>
|
|
|
+ <result column="change_order_id_" property="changeOrderId"/>
|
|
|
<result column="operation_" property="operation"/>
|
|
|
<result column="create_time_" property="createTime"/>
|
|
|
<result column="update_time" property="updateTime"/>
|
|
@@ -40,11 +41,11 @@
|
|
|
<!--@mbg.generated-->
|
|
|
insert into student_instrument
|
|
|
(student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_,
|
|
|
- status_,order_id_,operation_, start_time_, end_time_, create_time_, update_time
|
|
|
+ status_,order_id_,change_order_id_,operation_, start_time_, end_time_, create_time_, update_time
|
|
|
)
|
|
|
values
|
|
|
(#{studentId},#{organId},#{goodsId},#{goodsCategoryId},#{goodsCategoryName},#{goodsName},#{goodsBrand},#{specification},#{goodsImg},
|
|
|
- #{status},#{orderId},#{operation}, #{startTime}, #{endTime}, NOW(), NOW()
|
|
|
+ #{status},#{orderId},#{changeOrderId},#{operation}, #{startTime}, #{endTime}, NOW(), NOW()
|
|
|
)
|
|
|
</insert>
|
|
|
<update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentInstrument">
|
|
@@ -84,15 +85,16 @@
|
|
|
<if test="endTime != null">
|
|
|
end_time_ = #{endTime},
|
|
|
</if>
|
|
|
+ <if test="changeOrderId != null">
|
|
|
+ change_order_id_ = #{changeOrderId},
|
|
|
+ </if>
|
|
|
<if test="createTime != null">
|
|
|
create_time_ = #{createTime},
|
|
|
</if>
|
|
|
- <if test="updateTime != null">
|
|
|
- update_time = #{updateTime},
|
|
|
- </if>
|
|
|
<if test="delFlag != null">
|
|
|
del_flag_ = #{delFlag},
|
|
|
</if>
|
|
|
+ update_time = #{updateTime},
|
|
|
</set>
|
|
|
where id_ = #{id}
|
|
|
</update>
|
|
@@ -153,11 +155,11 @@
|
|
|
<insert id="batchAdd" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
|
|
|
insert into student_instrument
|
|
|
(student_id_,organ_id_,goods_id_,goods_category_id_,goods_category_name_,goods_name_,goods_brand_,specification_,goods_img_,
|
|
|
- order_id_,status_, start_time_, end_time_, create_time_, update_time)
|
|
|
+ order_id_,change_order_id_,status_, start_time_, end_time_, create_time_, update_time)
|
|
|
VALUE
|
|
|
<foreach collection="studentInstruments" item="item" separator=",">
|
|
|
(#{item.studentId},#{item.organId},#{item.goodsId},#{item.goodsCategoryId},#{item.goodsCategoryName},#{item.goodsName},#{item.goodsBrand},#{item.specification},#{item.goodsImg},
|
|
|
- #{item.orderId},#{item.status}, #{item.startTime},
|
|
|
+ #{item.orderId},#{item.changeOrderId},#{item.status}, #{item.startTime},
|
|
|
#{item.endTime}, NOW(), NOW())
|
|
|
</foreach>
|
|
|
</insert>
|
|
@@ -171,8 +173,17 @@
|
|
|
</update>
|
|
|
<select id="getListByEndTime" resultMap="StudentInstrument">
|
|
|
<![CDATA[
|
|
|
- SELECT * FROM student_instrument WHERE end_time_ >= #{startTime} AND end_time_ <= #{endTime}
|
|
|
- ]]>
|
|
|
+ SELECT *
|
|
|
+ FROM student_instrument
|
|
|
+ WHERE end_time_ >= #{startTime}
|
|
|
+ AND end_time_ <= #{endTime}
|
|
|
+ ]]>
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="getByOrderId" resultMap="StudentInstrument">
|
|
|
+ SELECT *
|
|
|
+ FROM student_instrument
|
|
|
+ WHERE order_id_ = #{orderId}
|
|
|
</select>
|
|
|
|
|
|
</mapper>
|