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-06-09 21:56:33 +08:00
parent b3bad102c3
commit 92fc682301
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -363,10 +363,10 @@ public class EmisWaybillController extends EmisBaseController
"sendCountry","sendCountryName", "sendCountry","sendCountryName",
"sendProvince","sendProvinceName", "sendProvince","sendProvinceName",
"sendCity","sendCityName", "sendCity","sendCityName",
"transLineType","transLineName", "transLineType","transLineTypeName",
"productType","productName", "productType","productTypeName",
"sendSiteName","destinationName", "sendSiteName","destinationName",
"dispatchUnderlingSiteName" "dispatchUnderlingSiteName",
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE) },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)

35
emis-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
View File

@ -224,10 +224,19 @@
and `name` = #{name} and `name` = #{name}
and phone = #{phone} and phone = #{phone}
and province = #{province} and province = #{province}
and city = #{city}
and county = #{county} <if test="city != null and city != ''"> and city = #{city}</if>
and address = #{address} <if test="city == null">and city is null</if>
and company = #{company}
<if test="county != null and county != ''">and county = #{county}</if>
<if test="county == null ">and county is null</if>
<if test="address != null and address != ''">and address = #{address}</if>
<if test="address == null">and address is null</if>
<if test="company != null and company != ''">and company = #{company}</if>
<if test="company == null">and company is null</if>
and address_type = #{addressType} and address_type = #{addressType}
and customer_code is null and customer_code is null
</select> </select>
@ -239,10 +248,20 @@
and `name` = #{name} and `name` = #{name}
and phone = #{phone} and phone = #{phone}
and province = #{province} and province = #{province}
and city = #{city}
and county = #{county} <if test="city != null and city != ''"> and city = #{city}</if>
and address = #{address} <if test="city == null">and city is null</if>
and company = #{company}
<if test="county != null and county != ''">and county = #{county}</if>
<if test="county == null ">and county is null</if>
<if test="address != null and address != ''">and address = #{address}</if>
<if test="address == null">and address is null</if>
<if test="company != null and company != ''">and company = #{company}</if>
<if test="company == null">and company is null</if>
and address_type = #{addressType} and address_type = #{addressType}
limit 1 limit 1
</select> </select>