1.超期箱使费模块列表检索

5.海运进出口增加字段订舱TEU

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1157,9 +1157,9 @@ public class Bills implements Serializable {
 	private Integer teu;
 
 	/**
-	 * TEU分单合计
+	 * 订舱TEU
 	 */
-	@ApiModelProperty(value = "TEU分单合计")
+	@ApiModelProperty(value = "订舱TEU")
 	private Integer teuTotal;
 	/**
 	 * 其他集装箱箱数

blade-service/blade-los/src/main/java/org/springblade/los/basic/storage/controller/StorageFeesController.java

@@ -16,23 +16,26 @@
  */
 package org.springblade.los.basic.storage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.basic.storage.entity.StorageFees;
-import org.springblade.los.basic.storage.vo.StorageFeesVO;
 import org.springblade.los.basic.storage.service.IStorageFeesService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.los.basic.storage.vo.StorageFeesVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 仓储费表 控制器
@@ -66,7 +69,17 @@ public class StorageFeesController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入storageFees")
 	public R<IPage<StorageFees>> list(StorageFees storageFees, Query query) {
-		IPage<StorageFees> pages = storageFeesService.page(Condition.getPage(query), Condition.getQueryWrapper(storageFees));
+		LambdaQueryWrapper<StorageFees> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(StorageFees::getTenantId, AuthUtil.getTenantId())
+			.eq(StorageFees::getIsDeleted, 0)
+			.eq(ObjectUtils.isNotNull(storageFees.getType()), StorageFees::getType, storageFees.getType())
+			.orderByDesc(StorageFees::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(StorageFees::getBranchId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(storageFees.getBranchId()), StorageFees::getBranchId, storageFees.getBranchId());
+		}
+		IPage<StorageFees> pages = storageFeesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -3314,8 +3314,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			}
 			Integer teu = bills.getTeu();
 			Integer teus = billsList.stream().map(Bills::getTeu).filter(Objects::nonNull).reduce(0, Integer::sum);
-			if (teu < teus+bills.getTeuTotal()) {
-				return R.data("分单订舱TEU大于主单订舱TEU");
+			if (teu < teus + bills.getTeuTotal()) {
+				return R.data("分单订舱TEU:" + teus + bills.getTeuTotal() + "大于主单TEU:" + teu);
 			}
 		}
 		return R.data("操作成功");