From 71cbd740e3c35f911004e6f3e22ec4a9fbad6990 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 26 十月 2024 16:29:39 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 12 ++++++++++++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml | 16 +++++-----------
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java | 3 ++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java | 26 +++++++++++++-------------
4 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java
index 7117147..d85c948 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java
@@ -14,7 +14,7 @@
@ApiModelProperty(value = "类型（1=开始，2=结束）")
private Integer type;
@ApiModelProperty(value = "站点ids 选择全部 不传")
- private List<Integer> siteIds;
+ private Integer siteIds;
@ApiModelProperty(value = "合作商id ")
private Integer partnerId;
@ApiModelProperty(value = "开始时间2020-01-01 00:00:00")
@@ -22,4 +22,5 @@
@ApiModelProperty(value = "结束时间2021-01-01 23:59:59")
private String endTime;
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
index 2ac66fd..3da1a3f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
@@ -877,91 +877,91 @@
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京B\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京C\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京D\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京E\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京F\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京G\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京H\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京J\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京K\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京L\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京M\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京Y\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"豫A\",\n" +
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 9440d8d..a5b335c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2435,6 +2435,18 @@
@Override
public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) {
+ if (StringUtils.hasLength(dto.getStartTime())){
+ dto.setType(1);
+ String[] split = dto.getStartTime().split(" - ");
+ dto.setStartTime(split[0]);
+ dto.setEndTime(split[1]);
+ }
+ if (StringUtils.hasLength(dto.getEndTime())){
+ dto.setType(2);
+ String[] split = dto.getStartTime().split(" - ");
+ dto.setStartTime(split[0]);
+ dto.setEndTime(split[1]);
+ }
PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
for (TSettlementConfirm tSettlementConfirm : list) {
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml
index cd7c16b..5b7209c 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml
@@ -13,28 +13,22 @@
select t1.* from
t_settlement_confirm t1
where 1=1
- <if test="req.type != null ">
- and t1.type = #{req.type}
- </if>
<if test="req.partnerId != null ">
- and t1.partnerId = #{req.partnerId}
+ and t1.partner_id = #{req.partnerId}
+ </if>
+ <if test="req.siteIds != null ">
+ and t1.site_id = #{req.siteIds}
</if>
<if test="req.type == 1 ">
<if test="req.startTime != null and req.startTime!=''">
and (t1.start_time between #{req.startTime} and #{req.endTime}
</if>
</if>
- <if test="req.siteIds != null and req.siteIds.size() > 0">
- AND t1.site_id IN
- <foreach collection="req.siteIds" item="siteId" open="(" separator="," close=")">
- #{siteId}
- </foreach>
- </if>
<if test="req.type == 2 ">
<if test="req.startTime != null and req.startTime!=''">
and (t1.end_time between #{req.startTime} and #{req.endTime}
</if>
</if>
-and t1.del_flag = 0
+ and t1.del_flag = 0
</select>
</mapper>
--
Gitblit v1.7.1