From 2c51f96fd55949db562fd0ef608b55ccb1530a1e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 03 十一月 2024 18:38:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml | 4 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java | 9 ++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java | 6 +++
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 2
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 27 +++++++++++++
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml | 2
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml | 2
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 11 +++--
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 15 ++++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 4 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 2 +
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java | 8 ++--
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 16 ++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 2
15 files changed, 92 insertions(+), 20 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
index a6ff664..d838d05 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java
@@ -163,6 +163,12 @@
public R<List<TChargingOrder>> getChargingOrder(TChargingOrderVo order) {
return R.fail("获取充电订单数据失败：" + throwable.getMessage());
}
+
+
+ @Override
+ public R<List<TChargingOrder>> getCarChargingOrder(Long carId, String startTime, String endTime) {
+ return R.fail("根据车辆id获取指定时间范围内的数据失败：" + throwable.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 94b480a..33352e4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -120,8 +120,8 @@
@GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
- @GetMapping(value = "/financial/settlement/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time);
+ @GetMapping(value = "/financial/settlement/settlementTotalR/{time}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time);
/**
* 修改充电订单
@@ -214,4 +214,15 @@
*/
@PostMapping("/t-charging-order/getChargingOrder")
R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);
+
+
+ /**
+ * 根据车辆id获取指定时间范围内的数据
+ * @param carId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/t-charging-order/getCarChargingOrder")
+ R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 84dfb2a..2562032 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -28,6 +28,8 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "累计退款金额 前端忽略")
+ @TableField(exist = false)
+
private BigDecimal refundAmount1;
@ApiModelProperty(value = "主键")
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 7c7a4b9..f4ab667 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -270,10 +270,10 @@
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
@PutMapping("/downloadBill")
@Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
- public R downloadBill(@RequestBody String uid, HttpServletResponse response)
+ public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
- chargingListQuery.setUid(uid);
+ chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
chargingListQuery.setPageSize(99999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
@@ -285,7 +285,8 @@
response.setContentType("application/vnd.ms-excel");
response.setHeader("Access-Control-Expose-Headers", "Content-disposition");
response.setHeader("Content-Disposition", "attachment;filename=" +
- URLEncoder.encode("月账单-"+data.getCategory()+"-"+data.getBillWeek()+"-"+data.getSiteName(), CharEncoding.UTF_8) + ".xlsx");
+// URLEncoder.encode("月账单-"+data.getCategory()+"-"+data.getBillWeek()+"-"+data.getSiteName(), CharEncoding.UTF_8) + ".xlsx");
+ URLEncoder.encode("月账单", CharEncoding.UTF_8) + ".xlsx");
} catch (UnsupportedEncodingException e) {
return R.fail("excel导出失败！");
}
@@ -639,10 +640,10 @@
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
@PutMapping("/download")
@Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
- public R download(String uid,HttpServletResponse response)
+ public R download(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
- chargingListQuery.setUid(uid);
+ chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
chargingListQuery.setPageSize(99999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
index fba4115..18719cc 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingRecordController.java
@@ -63,10 +63,19 @@
@ApiOperation(tags = {"后台-订单管理-停车记录"},value = "列表")
@PostMapping(value = "/page")
public R<Page<TParkingRecord>> page(@RequestBody ParkingRecordPageQuery query) {
+ String s1 = "";
+ String s2 = "";
+ if (query.getTimePeriod()!=null){
+ s1 = query.getTimePeriod().split(" - ")[0];
+ s2 = query.getTimePeriod().split(" - ")[1];
+ }
Page<TParkingRecord> page = parkingRecordService.lambdaQuery()
.like(query.getLicensePlate() != null, TParkingRecord::getLicensePlate, query.getLicensePlate())
.eq(query.getStatus() != null, TParkingRecord::getStatus, query.getStatus())
.eq(query.getOutParkingType() != null, TParkingRecord::getOutParkingType, query.getOutParkingType())
+ .between(query.getTimePeriod()!=null,TParkingRecord::getInParkingTime,s1,s2)
+ .or()
+ .between(query.getTimePeriod()!=null,TParkingRecord::getOutParkingTime,s1,s2)
.orderByDesc(TParkingRecord::getCreateTime)
.page(Page.of(query.getPageCurr(), query.getPageSize()));
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 4851c30..e9a3d00 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -97,7 +97,7 @@
<if test="null != item.districtsCode and '' != item.districtsCode">
and a.districts_code = #{item.districtsCode}
</if>
- <if test="null != ids">
+ <if test="null != ids and ids.size() > 0">
and a.id in
<foreach collection="ids" item="itemm" index="index" open="(" separator="," close=")">
#{itemm}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
index 1553995..eff0ffe 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingGunMapper.xml
@@ -58,7 +58,7 @@
<if test="query.chargeMode != null">
AND tcg.charge_mode = #{query.chargeMode}
</if>
- <if test="null != siteIds">
+ <if test="null != siteIds and siteIds.size() > 0">
and tcg.site_id in
<foreach collection="siteIds" index="index" item="item" open="(" separator="," close=")">
#{item}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
index 57d5c2b..ad9b8d2 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileMapper.xml
@@ -56,7 +56,7 @@
<if test="null != item.type">
and a.type = #{item.type}
</if>
- <if test="null != siteIds">
+ <if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" item="itemm" index="index" open="(" separator="," close=")">
#{itemm}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
index 2901664..ec5a430 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TChargingPileNotificationMapper.xml
@@ -44,7 +44,7 @@
from t_charging_pile_notification a
left join t_site b on (a.site_id = b.id)
where a.del_flag = 0
- <if test="null != siteIds">
+ <if test="null != siteIds and siteIds.size() > 0">
and a.site_id in
<foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
#{item}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index e5e32fb..6628553 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -1,6 +1,7 @@
package com.ruoyi.integration.barrierGate.server;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
import com.ruoyi.chargingPile.api.feignClient.ParkingRecordClient;
import com.ruoyi.chargingPile.api.model.TParkingLot;
@@ -10,6 +11,8 @@
import com.ruoyi.integration.barrierGate.model.CloudParkingSpace;
import com.ruoyi.integration.barrierGate.model.OfflineParkingOrder;
import com.ruoyi.integration.barrierGate.model.OfflineParkingSpace;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -18,6 +21,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
+import java.util.List;
/**
* @author zhibing.pu
@@ -34,6 +38,9 @@
@Resource
private ParkingLotClient parkingLotClient;
+
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
@@ -83,6 +90,16 @@
parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
parkingRecord.setOutParkingType(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 1);
parkingRecord.setTitle("【停车缴费】" + payment + "元");
+ TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(parkingRecord.getLicensePlate()).getData();
+ if(null != appUserCar){
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ List<TChargingOrder> data = chargingOrderClient.getCarChargingOrder(appUserCar.getId(), parkingRecord.getInParkingTime().format(formatter), LocalDateTime.now().format(formatter)).getData();
+ if(null != data && data.size() > 0){
+ TChargingOrder chargingOrder = data.get(0);
+ parkingRecord.setAppUserId(chargingOrder.getAppUserId());
+ parkingRecord.setChargingOrderId(chargingOrder.getId());
+ }
+ }
parkingRecordClient.updateParkingRecord(parkingRecord);
}
@@ -139,6 +156,16 @@
parkingRecord.setStatus(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 3);
parkingRecord.setOutParkingType(BigDecimal.ZERO.compareTo(payment) == 0 ? 2 : 1);
parkingRecord.setTitle("【停车缴费】" + payment + "元");
+ TAppUserCar appUserCar = appUserCarClient.getAppUserCarByLicensePlate(parkingRecord.getLicensePlate()).getData();
+ if(null != appUserCar){
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ List<TChargingOrder> data = chargingOrderClient.getCarChargingOrder(appUserCar.getId(), parkingRecord.getInParkingTime().format(formatter), LocalDateTime.now().format(formatter)).getData();
+ if(null != data && data.size() > 0){
+ TChargingOrder chargingOrder = data.get(0);
+ parkingRecord.setAppUserId(chargingOrder.getAppUserId());
+ parkingRecord.setChargingOrderId(chargingOrder.getId());
+ }
+ }
parkingRecordClient.updateParkingRecord(parkingRecord);
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
index dca9c5f..0669173 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
@@ -63,10 +63,10 @@
String service_id = content.getString("service_id");
log.info("服务id:{}",service_id);
// 写入文件
- FileWriter writer = new FileWriter("D:/sample.txt",true);
- writer.write("接收到消息中转："+jsonObject+"\n");
- writer.write("服务id:"+service_id+"\n");
- writer.close();
+// FileWriter writer = new FileWriter("D:/sample.txt",true);
+// writer.write("接收到消息中转："+jsonObject+"\n");
+// writer.write("服务id:"+service_id+"\n");
+// writer.close();
SendResult sendResult;
ChargingMessage chargingMessage = new ChargingMessage();
chargingMessage.setServiceId(service_id);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 986c4db..66b8377 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -282,8 +282,8 @@
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return AjaxResult.success(res);
}
- @GetMapping(value = "/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time) {
+ @GetMapping(value = "/settlementTotalR/{time}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) {
time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return R.ok(res);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 4a14d46..c722bcb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1864,4 +1864,20 @@
List<TChargingOrder> chargingOrder = chargingOrderService.getChargingOrder(order);
return R.ok(chargingOrder);
}
+
+
+ /**
+ * 根据车辆id获取指定时间范围内的数据
+ * @param carId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/getCarChargingOrder")
+ public R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime){
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserCarId, carId).eq(TChargingOrder::getDelFlag, 0)
+ .in(TChargingOrder::getStatus, Arrays.asList(4, 5)).between(TChargingOrder::getStartTime, startTime, endTime));
+ return R.ok(list);
+ }
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
index 1db4d3a..ef11ca4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
@@ -48,7 +48,7 @@
@ApiOperation(tags = {"小程序-订单评价"},value = "充电订单评价标签及数量查询")
@GetMapping(value = "/getTagCount")
- public AjaxResult<List<TEvaluationTagVO>> getTagCount(@RequestParam(value = "siteId")@ApiParam(value = "站点id")Integer siteId) {
+ public AjaxResult<List<TEvaluationTagVO>> getTagCount(@ApiParam(value = "站点id")Integer siteId) {
return AjaxResult.ok(orderEvaluateService.getTagCount(siteId));
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
index 872f114..8bdfc50 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
@@ -144,7 +144,7 @@
LEFT JOIN `charging_pile_other`.`t_evaluation_tag` tt on ot.evaluation_tag_id = tt.id
WHERE ot.evaluation_tag_id in (
SELECT id from `charging_pile_other`.`t_evaluation_tag` WHERE type = 1
- ) <if test="null != siteIds">
+ ) <if test="null != siteIds and siteIds.size() > 0">
and co.site_id in
<foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
#{item}
@@ -171,7 +171,7 @@
LEFT JOIN `charging_pile_other`.`t_evaluation_tag` tt on ot.evaluation_tag_id = tt.id
WHERE ot.evaluation_tag_id in (
SELECT id from `charging_pile_other`.`t_evaluation_tag` WHERE type = 3
- ) <if test="null != siteIds">
+ ) <if test="null != siteIds and siteIds.size() > 0">
and co.site_id in
<foreach collection="siteIds" item="item" index="index" open="(" separator="," close=")">
#{item}
--
Gitblit v1.7.1