aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: TMS系统 - 运输管理 - 漏组批次统计 - 查询漏组批次统计列表、导出漏组详细数据、导出漏组批次统计查询接口数据支持根据时间范围查询/导出 TMS系统 - 客户账单管理 - 发票收款针对相同账单不同发票合并收款特殊逻辑特殊处理

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-09-28 17:20:38 +08:00
parent 3b74434320
commit 02266528f0
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMissStatistics.java
View File

@ -1,7 +1,6 @@
package com.xdadan.erp.emis.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import com.xdadan.erp.common.core.domain.BaseEntity;
import lombok.Data;
@ -29,13 +28,9 @@ public class EmisTmsSiteBatchMissStatistics extends BaseEntity {
/** 票数 */
private Integer ticketCount;
/** 开始时间（含） */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/** 开始月份（含），格式：yyyy-MM */
private String startTime;
/** 结束时间（含） */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/** 结束月份（含），格式：yyyy-MM */
private String endTime;
}

40
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissStatisticsMapper.xml
View File

@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startSiteCode != null and startSiteCode != ''">
AND bm.start_site_code = #{startSiteCode}
</if>
<if test="startTime != null">
AND w.send_date <![CDATA[ >= ]]> #{startTime}
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime != null">
AND w.send_date <![CDATA[ <= ]]> #{endTime}
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ <= ]]> #{endTime}
</if>
<if test="startTime == null and endTime == null">
<if test="(startTime == null or startTime == '') and (endTime == null or endTime == '')">
<if test="billMonth != null">
AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{billMonth}, '%Y-%m')
</if>
@ -76,13 +76,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startSiteCode != null and startSiteCode != ''">
AND m.start_site_code = #{startSiteCode}
</if>
<if test="startTime != null">
AND w.send_date <![CDATA[ >= ]]> #{startTime}
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime != null">
AND w.send_date <![CDATA[ <= ]]> #{endTime}
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ <= ]]> #{endTime}
</if>
<if test="startTime == null and endTime == null">
<if test="(startTime == null or startTime == '') and (endTime == null or endTime == '')">
<if test="billMonth != null">
AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{billMonth}, '%Y-%m')
</if>
@ -128,13 +128,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.startSiteCode != null and query.startSiteCode != ''">
AND m.start_site_code = #{query.startSiteCode}
</if>
<if test="query.startTime != null">
AND w.send_date <![CDATA[ >= ]]> #{query.startTime}
<if test="query.startTime != null and query.startTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ >= ]]> #{query.startTime}
</if>
<if test="query.endTime != null">
AND w.send_date <![CDATA[ <= ]]> #{query.endTime}
<if test="query.endTime != null and query.endTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ <= ]]> #{query.endTime}
</if>
<if test="query.startTime == null and query.endTime == null">
<if test="(query.startTime == null or query.startTime == '') and (query.endTime == null or query.endTime == '')">
<if test="query.billMonth != null">
AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{query.billMonth}, '%Y-%m')
</if>
@ -152,13 +152,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startSiteCode != null and startSiteCode != ''">
AND m.start_site_code = #{startSiteCode}
</if>
<if test="startTime != null">
AND w.send_date <![CDATA[ >= ]]> #{startTime}
<if test="startTime != null and startTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime != null">
AND w.send_date <![CDATA[ <= ]]> #{endTime}
<if test="endTime != null and endTime != ''">
AND DATE_FORMAT(w.send_date, '%Y-%m') <![CDATA[ <= ]]> #{endTime}
</if>
<if test="startTime == null and endTime == null">
<if test="(startTime == null or startTime == '') and (endTime == null or endTime == '')">
<if test="billMonth != null">
AND DATE_FORMAT(w.send_date, '%Y-%m') = DATE_FORMAT(#{billMonth}, '%Y-%m')
</if>