java/mx_charging_pile.git

			@@ -21,14 +21,16 @@
			private Integer status;
			@ApiModelProperty(value = "站点id")
			private Integer siteId;
			@ApiModelProperty(value = "充电桩ids 逗号拼接")
			private String pileIds;
			@ApiModelProperty(value = "充电枪ids 逗号拼接")
			private String gunIds;
			@ApiModelProperty(value = "充电桩id ")
			private Integer pileId;
			@ApiModelProperty(value = "充电枪id ")
			private Integer gunId;
			@ApiModelProperty(value = "开始时间2020-01-01 00:00:00 - 2021-01-01 23:59:59")
			private String startTime;
			@ApiModelProperty(value = "结束时间2020-01-01 00:00:00 - 2021-01-01 23:59:59")
			private String endTime;
			@ApiModelProperty(value = "订单来源 1明星 2快电 3新电途")
			private Integer orderSource;
			@ApiModelProperty(value = "用户ids 前端忽略")
			private List<Long> userIds;
			}

			@@ -24,7 +24,7 @@
			@EqualsAndHashCode(callSuper = false)
			@TableName("t_integral_rule")
			@ApiModel(value="TIntegralRule对象", description="")
			public class TIntegralRule extends BasePojo {
			public class TIntegralRule {

			private static final long serialVersionUID = 1L;

			@@ -70,6 +70,36 @@
			<select id="chargingOrder" resultType="com.ruoyi.order.api.vo.ChargingOrderVO">
			select t1.*
			from t_charging_order t1

			where 1=1
			<if test="null != req.code and req.code!=''">
			and t1.code LIKE CONCAT('%',#{req.code},'%')
			</if>
			<if test="null != req.userIds and req.userIds.size()>0" >
			and t1.app_user_id in
			<foreach collection="req.userIds" item="item" index="index" separator="," open="(" close=")">
			#{item}
			</foreach>
			</if>
			<if test="req.orderType != null ">
			and t1.order_type = #{req.orderType}
			</if>
			<if test="req.status != null ">
			and t1.status = #{req.status}
			</if>
			<if test="req.siteId != null ">
			and t1.site_id = #{req.siteId}
			</if>
			<if test="req.pileId != null ">
			and t1.charging_pile_id = #{req.pileId}
			</if>
			<if test="req.gunId != null ">
			and t1.charging_gun_id = #{req.gunId}
			</if>
			<if test="startTime1 != null and startTime1!=''">
			and (t1.start_time between #{startTime1} and #{startTime2}
			</if>
			<if test="endTime1 != null and endTime1!=''">
			and (t1.end_time between #{endTime1} and #{endTime2}
			</if>
			</select>
			</mapper>

	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/ChargingOrderQuery.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史