autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-11 17:48:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

站点日报按日期查询

Browse Source
This commit is contained in:
Guoqs
2025-03-24 14:33:07 +08:00
parent 51c0bc731d
commit f2f46b3d45
6 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/SettleOrderReportController.java
View File

@@ -35,9 +35,9 @@ public class SettleOrderReportController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('order:report:list')")
@GetMapping("/list")
public TableDataInfo list(SettleOrderReport settleOrderReport) {
public TableDataInfo list(SettleOrderReportDTO dto) {
startPage();
List<SettleOrderReport> list = settleOrderReportService.selectSettleOrderReportList(settleOrderReport);
List<SettleOrderReport> list = settleOrderReportService.selectSettleOrderReportList(dto);
return getDataTable(list);
}

10
jsowell-pile/src/main/java/com/jsowell/pile/dto/SettleOrderReportDTO.java
View File

@@ -30,4 +30,14 @@ public class SettleOrderReportDTO {
* 页面容量
*/
private Integer pageSize;
/**
* 开始时间 yyyy-MM-dd
*/
private String startTime;
/**
* 结束时间 yyyy-MM-dd
*/
private String endTime;
}

3
jsowell-pile/src/main/java/com/jsowell/pile/mapper/SettleOrderReportMapper.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.MerchantOrderReportDTO;
import com.jsowell.pile.dto.SettleOrderReportDTO;
import com.jsowell.pile.vo.web.SettleOrderReportVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -84,6 +85,8 @@ public interface SettleOrderReportMapper {
*/
List<SettleOrderReport> selectSettleOrderReportList(SettleOrderReport settleOrderReport);
List<SettleOrderReport> selectListBySettleOrderReportDTO(@Param("dto") SettleOrderReportDTO dto);
/**
* 新增结算订单报
*

2
jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java
View File

@@ -40,6 +40,8 @@ public interface SettleOrderReportService {
*/
public List<SettleOrderReport> selectSettleOrderReportList(SettleOrderReport settleOrderReport);
List<SettleOrderReport> selectSettleOrderReportList(SettleOrderReportDTO dto);
/**
* 新增结算订单报
*

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -93,8 +93,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
return settleOrderReportMapper.selectByStationIdAndDate(stationId, date);
}
/**
* 查询站点订单日报明细
* 分页查询
@@ -221,6 +219,11 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
return settleOrderReportMapper.selectSettleOrderReportList(settleOrderReport);
}
@Override
public List<SettleOrderReport> selectSettleOrderReportList(SettleOrderReportDTO dto) {
return settleOrderReportMapper.selectListBySettleOrderReportDTO(dto);
}
/**
* 新增结算订单报
*

19
jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
View File

@@ -939,4 +939,23 @@
</if>
and trade_date between #{startDate,jdbcType=VARCHAR} and #{endDate,jdbcType=VARCHAR}
</select>
<select id="selectListBySettleOrderReportDTO" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from settle_order_report
where del_flag = '0'
<if test="dto.merchantId != null and dto.merchantId != ''">
and merchant_id = #{dto.merchantId,jdbcType=VARCHAR}
</if>
<if test="dto.stationId != null and dto.stationId != ''">
and station_id = #{dto.stationId,jdbcType=VARCHAR}
</if>
<if test="dto.startTime != null and dto.startTime != ''">
and trade_date <![CDATA[ >= ]]> #{dto.startTime,jdbcType=VARCHAR}
</if>
<if test="dto.endTime != null and dto.endTime != ''">
and trade_date <![CDATA[ <= ]]> #{dto.endTime,jdbcType=VARCHAR}
</if>
</select>
</mapper>