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

md

Browse Source
This commit is contained in:
linfso 2024-08-01 15:32:09 +08:00
parent e63163e733
commit 714d34e7a2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
View File

@ -241,7 +241,7 @@ public class WaybillHelper {
public static String cvtBillToJsonString(Object obj) { public static String cvtBillToJsonString(Object obj) {
return JSON.toJSONString(obj, (ValueFilter) (object, name, value) -> { return JSON.toJSONString(obj, (ValueFilter) (object, name, value) -> {
if(value == null){ if(value == null){
return ""; return " ";
} }
return value; return value;
}, SerializerFeature.WriteMapNullValue); }, SerializerFeature.WriteMapNullValue);

3
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -106,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="confirmSiteCode != null and confirmSiteCode != ''"> and b.confirm_site_code = #{confirmSiteCode}</if> <if test="confirmSiteCode != null and confirmSiteCode != ''"> and b.confirm_site_code = #{confirmSiteCode}</if>
<!-- 过滤掉虚拟单 -->
and a.problem_type !=
<if test="params.sendSiteCode != null and params.sendSiteCode != ''"> <if test="params.sendSiteCode != null and params.sendSiteCode != ''">
and a.send_site_code = #{params.sendSiteCode} and a.send_site_code = #{params.sendSiteCode}
</if> </if>