UPDATE

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java

@@ -383,6 +383,11 @@ public class PileStationInfo extends BaseEntity {
 	@Excel(name = "周边配套设施")
 	private String supportingFacilities;
 
+	/**
+	 * 站点额定总功率
+	 */
+	@Excel(name = "站点额定总功率")
+	private BigDecimal ratedPower;
 
 	/**
 	 * 删除标识（0-正常；1-删除）
@@ -436,6 +441,7 @@ public class PileStationInfo extends BaseEntity {
 				.append("delFlag", delFlag)
 				.append("swapMatchCars", swapMatchCars)
 				.append("generalApplicationType",generalApplicationType)
+				.append("ratedPower",ratedPower)
 				.toString();
 	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java

@@ -110,7 +110,6 @@ public interface PileBasicInfoService {
 	/**
 	 * 通过桩sn查询basic信息
 	 *
-	 * @param id 桩id
 	 * @return 结果集合
 	 */
 	PileDetailVO selectPileDetailByPileSn(String pileSn);
@@ -206,7 +205,6 @@ public interface PileBasicInfoService {
 	/**
 	 * 获取充电桩列表
 	 * 提供给联联平台
-	 * @param pileStationInfo
 	 * @return
 	 */
 	// List<EquipmentInfo> getPileList(PileStationInfo pileStationInfo);

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java

@@ -81,7 +81,7 @@ public class EquipmentInfo {
      * 1：车辆充电设备 2：换电站内的电池箱 充电设备
      */
     @JSONField(name = "EquipmentClassification")
-    private Integer EquipmentClassification;
+    private Integer equipmentClassification;
 
     /**
      * 设备状态  Y

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -2912,8 +2912,10 @@
     JOIN pile_merchant_info t3 on t1.merchant_id = t3.id
     WHERE
       t1.station_id = #{stationId,jdbcType=VARCHAR}
-      AND t1.charge_start_time <![CDATA[ >= ]]> DATE_SUB( CURDATE(), INTERVAL 1 DAY )
-      AND t1.charge_start_time <![CDATA[ < ]]> CURDATE()
+--       AND t1.charge_start_time <![CDATA[ >= ]]> DATE_SUB( CURDATE(), INTERVAL 1 DAY )
+--       AND t1.charge_start_time <![CDATA[ < ]]> CURDATE()
+      AND t1.charge_start_time <![CDATA[ >= ]]> '2024-07-08'
+      AND t1.charge_start_time <![CDATA[ < ]]> '2024-8-19'
   </select>
 
   <select id="queryOrderByOccupyTime" resultType="com.jsowell.pile.vo.web.OrderListVO">