java/mx_charging_pile.git

			@@ -1422,7 +1422,7 @@
			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
			if (data5!=null){
			if (data5.getTime_remaining()!=null){
			chargingOrderListVO.setChargingSecond(data5.getTime_remaining()*60L);
			chargingOrderListVO.setChargingSecond(data5.getCumulative_charging_time()*60L);

			}
			}
			@@ -1431,8 +1431,8 @@
			List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
			if (data6!=null && !data6.isEmpty()){
			// 第一条数据soc为开始最后一条数据soc为结束soc
			chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
			chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
			chargingOrderListVO.setEndSoc(data6.get(0).getSoc().toString());
			chargingOrderListVO.setStartSoc(data6.get(data6.size()-1).getSoc().toString());
			}
			}

			@@ -93,7 +93,7 @@
			and t1.status = #{req.status}
			</if>
			<if test="req.orderSource != null and req.orderSource != 1 ">
			and t1.orderSource = #{req.orderSource}
			and t1.order_source = #{req.orderSource}
			</if>
			<if test="req.siteId != null ">
			and t1.site_id = #{req.siteId}
			@@ -850,7 +850,7 @@

			</select>
			<select id="chargingList" resultType="com.ruoyi.order.api.vo.ChargingOrderListVO">
			select t1.* ,t1.current as chargingCapacity,t1.recharge_amount as paymentAmount,t1.electricity as chargingCapacity from t_charging_order t1
			select t1.* ,t1.current as chargingCapacity,t1.payment_amount as paymentAmount,t1.electricity as chargingCapacity from t_charging_order t1
			where 1=1
			<if test="null != req.code and req.code!=''">
			and t1.code LIKE CONCAT('%',#{req.code},'%')

	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史