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 2025-03-31 11:09:16 +08:00
parent b85007c561
commit 58141603bb
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
View File

@ -99,6 +99,10 @@ public class EmisWaybillAttachmentController extends EmisBaseController
if(!StringUtils.isEmpty(billCode)){
EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment();
emisWaybillAttachment.setBillCode(billCode);
String[] billCodeSortList = emisWaybillAttachment.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWaybillAttachment.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
}
list = emisWaybillAttachmentService.selectEmisWaybillAttachmentList(emisWaybillAttachment);
}else{
list = new ArrayList<>();

2
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -285,7 +285,7 @@
</if>
<if test="billCode != null and billCode != ''">
<!-- and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) -->
and bill_code in
and bill_code in
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
#{item}
</foreach>

8
emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
View File

@ -28,7 +28,13 @@
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="waybillId != null "> and waybill_id = #{waybillId}</if>
<if test="billCode != null and billCode != ''"> and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) </if>
<if test="billCode != null and billCode != ''">
and bill_code in
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<!-- and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) -->
</if>
<if test="attachType != null and attachType != ''"> and FIND_IN_SET(attach_type,#{attachType})</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>