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-14 13:05:05 +08:00
parent 2c0ce7e8af
commit bd31fc9c9d
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
View File

@ -67,6 +67,9 @@ public class EmisWaybillTransferController extends EmisBaseController
public TableDataInfo list(EmisWaybillTransfer emisWaybillTransfer)
{
startPage();
setPrivParams(emisWaybillTransfer);
if(!StringUtils.isEmpty(emisWaybillTransfer.getBillCode())){
emisWaybillTransfer.setBillCode(WaybillHelper.formatQueryValue(emisWaybillTransfer.getBillCode()));
String[] billCodeSortList = emisWaybillTransfer.getBillCode().split(",");

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

@ -208,6 +208,7 @@ public class WaybillHelper {
public static String formatQueryValue(String str) {
if(!StringUtils.isEmpty(str)){
str=str.replaceAll("\\n", ",");
str=str.replaceAll(",+", ",");
str=StringUtils.removeEnd(str, ",");
}

26
emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
View File

@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="transferBillCode != null and transferBillCode != ''"> and transfer_bill_code like concat('%', #{transferBillCode}, '%')</if>
<if test="transferDate != null "> and transfer_date = #{transferDate}</if>
<if test="transferExpress != null and transferExpress != ''"> and transfer_express like concat('%', #{transferExpress}, '%')</if>
<if test="transferExpress != null and transferExpress != ''"> and transfer_express=#{transferExpress}</if>
<if test="linkMan != null and linkMan != ''"> and link_man like concat('%', #{linkMan}, '%')</if>
<if test="linkPhone != null and linkPhone != ''"> and link_phone like concat('%', #{linkPhone}, '%')</if>
<if test="transferFee != null "> and transfer_fee = #{transferFee}</if>
@ -58,8 +58,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="params.beginTransferDate != null and params.beginTransferDate != ''">
and transfer_date <![CDATA[ >= ]]> #{params.beginTransferDate}
</if>
<if test="params.endTransferDate != null and params.endTransferDate != ''">
and transfer_date <![CDATA[ <= ]]> #{params.endTransferDate}
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (
create_site in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
)
</if>
</where>
order by create_time desc
</select>