页面加点条件和展示

trade-service/src/main/java/com/trade/service/trade/salesorder/service/impl/CustomsDeclarationServiceImpl.java

@@ -94,8 +94,10 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
         PageHelper.startPage(search.getPage(), search.getRows());
         List<CustomsDeclaration4FilingDocVO> list = this.baseMapper.queryList4FilingDocBySearch(search);
         list.forEach(item -> {
-            item.setCustomsFile(new FileAbstractDto(tFileStorageService.getFileStorageById(item.getCustomsFileId())));
-            item.setEntrustFile(new FileAbstractDto(tFileStorageService.getFileStorageById(item.getEntrustFileId())));
+            Optional.ofNullable(item.getEntrustFileId()).ifPresent(
+                    fileId -> item.setEntrustFile(new FileAbstractDto(tFileStorageService.getFileStorageById(fileId))));
+            Optional.ofNullable(item.getCustomsFileId()).ifPresent(
+                    fileId -> item.setCustomsFile(new FileAbstractDto(tFileStorageService.getFileStorageById(fileId))));
         });
         return new PageInfo<>(list);
     }

trade-service/src/main/java/com/trade/service/trade/salesorder/vo/SalesOrderLogisticsSearch.java

@@ -40,4 +40,6 @@ public class SalesOrderLogisticsSearch extends BaseSearch {
     private String ladingBillNoOrSaleOrderNo;
     @ApiModelProperty(name = "containerNo", value = "集装箱单号")
     private String containerNo;
+    @ApiModelProperty(name = "importerId", value = "进口商id")
+    private Long importerId;
 }

trade-service/src/main/java/com/trade/service/trade/salesorder/vo/SalesOrderLogisticsVO.java

@@ -33,4 +33,6 @@ public class SalesOrderLogisticsVO {
     private String customerIdentifierNo;
     @ApiModelProperty(name = "enterpriseName", value = "企业名称")
     private String enterpriseName;
+    @ApiModelProperty(name = "importerName", value = "进口商名称")
+    private String importerName;
 }

trade-service/src/main/resources/mapper/trade/salesorder/SalesOrderLogisticsMapper.xml

@@ -80,6 +80,9 @@ lading_bill_no, lading_bill_file_id, estimated_arrival_time, deliver_remark, gmt
         <if test="userName!= null and userName!= ''">
             AND f.identifier_no = #{userName} or g.name like CONCAT('%',#{userName},'%')
         </if>
+        <if test="importerId!= null">
+            AND b.importer_id = #{importerId}
+        </if>
         ORDER BY a.id DESC
     </select>
     <select id="getDetailByOrderNo" resultType="com.trade.service.trade.salesorder.vo.SalesOrderLogisticsDtlVO">