标书变更

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Biding.java

@@ -284,4 +284,6 @@ public class Biding implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String corpId;
+
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportBidingController.java

@@ -74,25 +74,7 @@ public class ExportBidingController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "自定义分页", notes = "传入biding")
 	public R<IPage<Biding>> page(Query query, Biding biding){
-		LambdaQueryWrapper<Biding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(Biding::getTenantId, AuthUtil.getTenantId());
-		lambdaQueryWrapper.eq(Biding::getIsDeleted, 0);
-		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getReleaseBeginTime()) && StringUtil.isNotBlank(biding.getReleaseEndTime()),
-			Biding::getReleaseTime, biding.getReleaseBeginTime(), biding.getReleaseEndTime());//发布日期
-		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getDeadlineBeginTime()) && StringUtil.isNotBlank(biding.getDeadlineEndTime()),
-			Biding::getDeadlineTime, biding.getDeadlineBeginTime(), biding.getDeadlineEndTime());//截止时间
-		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getLoadingBeginTime()) && StringUtil.isNotBlank(biding.getLoadingEndTime()),
-			Biding::getLoadingTime, biding.getLoadingBeginTime(), biding.getLoadingEndTime());//装柜时间
-		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getCreateBeginTime()) && StringUtil.isNotBlank(biding.getCreateEndTime()),
-			Biding::getCreateTime, biding.getCreateBeginTime(), biding.getCreateEndTime());//制单时间
-		lambdaQueryWrapper.eq(StringUtil.isNotBlank(biding.getDepartureHarbor()), Biding::getDepartureHarbor, biding.getDepartureHarbor());//起运港
-		lambdaQueryWrapper.eq(StringUtil.isNotBlank(biding.getObjectiveHarbor()), Biding::getObjectiveHarbor, biding.getObjectiveHarbor());//目的港
-		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(biding.getCreateUser()), Biding::getCreateUser, biding.getCreateUser());//制单人
-		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(biding.getStatus()), Biding::getStatus, biding.getStatus());//状态
-		lambdaQueryWrapper.orderByDesc(Biding::getId);
-
-		IPage<Biding> iPage = bidingService.page(Condition.getPage(query), lambdaQueryWrapper);
-		return R.data(iPage);
+		return R.data(bidingService.selectBidingPage(biding, query));
 	}
 
 	/**

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.java

@@ -3,6 +3,7 @@ package org.springblade.purchase.sales.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.core.datascope.annotation.DataAuth;
 import org.springblade.purchase.sales.entity.Biding;
 
 import java.util.List;
@@ -19,5 +20,6 @@ public interface BidingMapper extends BaseMapper<Biding> {
 	 * @param biding
 	 * @return
 	 */
+	@DataAuth(code = "bidingOnly")
 	List<Biding> salaryBiding(@Param("biding") Biding biding, IPage page);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -50,7 +50,7 @@
             BCD.id as corpId
         FROM business_biding BB
         LEFT JOIN business_biding_agent BBA ON BBA.pid = BB.id
-        LEFT JOIN basic_corps_desc BCD ON BCD.id = BBA.agent_name
+        LEFT JOIN basic_corps_desc BCD ON BCD.id = BBA.agent_id
         <where>
             BB.is_deleted = 0
             and BBA.is_deleted = 0

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IBidingItemsService.java

@@ -22,6 +22,11 @@ public interface IBidingItemsService extends IService<BidingItems> {
 	List<BidingItems> saveBidingItemsMessage(List<BidingItems> list, Long pid, Integer distinguish);
 
 	/**
+	 * 获得订单明细信息
+	 */
+	List<BidingItems> getBidingItems(Biding biding, Integer distinguish);
+
+	/**
 	 * 更新状态
 	 *
 	 * @param id

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IBidingService.java

@@ -2,6 +2,7 @@ package org.springblade.purchase.sales.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.finance.vo.CostMessage;
 import org.springblade.purchase.sales.entity.Biding;
@@ -24,6 +25,11 @@ public interface IBidingService extends IService<Biding> {
 	Biding getBidingMassage(Biding biding);
 
 	/**
+	 * 自定义分页
+	 */
+	IPage<Biding> selectBidingPage(Biding biding, Query query);
+
+	/**
 	 * app列表分页数据
 	 * @param biding
 	 * @return

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingItemsServiceImpl.java

@@ -34,6 +34,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 	 * @param distinguish 区分标识
 	 * @return
 	 */
+	@Override
 	public List<BidingItems> saveBidingItemsMessage(List<BidingItems> list, Long pid, Integer distinguish){
 		list.forEach(item -> {
 			if (item.getId() == null){//id为空 新增
@@ -64,6 +65,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 	 * @param distinguish 区分标识
 	 * @return
 	 */
+	@Override
 	public List<BidingItems> getBidingItems(Biding biding, Integer distinguish){
 		List<BidingItems> list = baseMapper.selectList(new LambdaQueryWrapper<BidingItems>()
 			.eq(BidingItems::getPid, biding.getId())

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingServiceImpl.java

@@ -11,17 +11,16 @@ import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
 import org.springblade.client.feign.ISerialClient;
+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.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.finance.vo.CostMessage;
 import org.springblade.purchase.sales.entity.Biding;
 import org.springblade.purchase.sales.entity.BidingAgent;
 import org.springblade.purchase.sales.entity.BidingItems;
-import org.springblade.purchase.sales.entity.Order;
-import org.springblade.purchase.sales.enums.OrderStatusEnum;
 import org.springblade.purchase.sales.mapper.BidingMapper;
 import org.springblade.purchase.sales.service.IBidingService;
 import org.springframework.stereotype.Service;
@@ -75,6 +74,32 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 	}
 
 	/**
+	 * 自定义分页
+	 */
+	@Override
+	public IPage<Biding> selectBidingPage(Biding biding, Query query){
+		LambdaQueryWrapper<Biding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Biding::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.eq(Biding::getIsDeleted, 0);
+		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getReleaseBeginTime()) && StringUtil.isNotBlank(biding.getReleaseEndTime()),
+			Biding::getReleaseTime, biding.getReleaseBeginTime(), biding.getReleaseEndTime());//发布日期
+		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getDeadlineBeginTime()) && StringUtil.isNotBlank(biding.getDeadlineEndTime()),
+			Biding::getDeadlineTime, biding.getDeadlineBeginTime(), biding.getDeadlineEndTime());//截止时间
+		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getLoadingBeginTime()) && StringUtil.isNotBlank(biding.getLoadingEndTime()),
+			Biding::getLoadingTime, biding.getLoadingBeginTime(), biding.getLoadingEndTime());//装柜时间
+		lambdaQueryWrapper.between(StringUtil.isNotBlank(biding.getCreateBeginTime()) && StringUtil.isNotBlank(biding.getCreateEndTime()),
+			Biding::getCreateTime, biding.getCreateBeginTime(), biding.getCreateEndTime());//制单时间
+		lambdaQueryWrapper.eq(StringUtil.isNotBlank(biding.getDepartureHarbor()), Biding::getDepartureHarbor, biding.getDepartureHarbor());//起运港
+		lambdaQueryWrapper.eq(StringUtil.isNotBlank(biding.getObjectiveHarbor()), Biding::getObjectiveHarbor, biding.getObjectiveHarbor());//目的港
+		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(biding.getCreateUser()), Biding::getCreateUser, biding.getCreateUser());//制单人
+		lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(biding.getStatus()), Biding::getStatus, biding.getStatus());//状态
+		lambdaQueryWrapper.orderByDesc(Biding::getId);
+
+		IPage<Biding> iPage = baseMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
+		return iPage;
+	}
+
+	/**
 	 * app列表分页数据
 	 * @param biding
 	 * @return