出口价格库

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -25,6 +26,7 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +36,8 @@ import org.springblade.mocha.vo.PriceBankVO;
 import org.springblade.mocha.service.IPriceBankService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.time.Period;
+
 /**
  * 出口价格库 控制器
  *
@@ -76,8 +80,15 @@ public class PriceBankController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入priceBank")
-	public R<IPage<PriceBankVO>> page(PriceBankVO priceBank, Query query) {
-		IPage<PriceBankVO> pages = priceBankService.selectPriceBankPage(Condition.getPage(query), priceBank);
+	public R<IPage<PriceBank>> page(PriceBankVO priceBank, Query query) {
+		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PriceBank::getIsDeleted,0);
+		lambdaQueryWrapper.eq(PriceBank::getTenantId, SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(PriceBank::getTradeType,"CK");
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getCname()),PriceBank::getCname,priceBank.getCname());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getCorpId()),PriceBank::getCorpId,priceBank.getCorpId());
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getSpecs()),PriceBank::getSpecs,priceBank.getSpecs());
+		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/PriceBankMapper.xml

@@ -47,12 +47,12 @@
         UPDATE
 	basic_price_bank
 	SET
-		price_one = price,
-		price_one_time = price_time,
+	    price_three = price_two,
+		price_three_time = price_two_time,
 		price_two = price_one,
 		price_two_time = price_one_time,
-		price_three = price_two,
-		price_three_time = price_two_time
+		price_one = price,
+		price_one_time = price_time
 	WHERE
 		id = #{id}
     </update>

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.mocha.entity.PriceBank;
 import org.springblade.mocha.vo.PriceBankVO;
@@ -46,7 +47,9 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 		if (priceBank.getId() == null){
 			priceBank.setCreateTime(new Date());
 			priceBank.setCreateUser(SecureUtil.getUserId());
-			priceBank.setPerson(SecureUtil.getUserName());
+			if (StringUtils.isBlank(priceBank.getPerson())){
+				priceBank.setPerson(SecureUtil.getUserName());
+			}
 			priceBank.setTenantId(SecureUtil.getTenantId());
 			priceBank.setPriceTime(new Date());
 			baseMapper.insert(priceBank);
@@ -60,6 +63,7 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 			priceBank.setPriceThree(bank.getPriceThree());
 			priceBank.setPriceThreeTime(bank.getPriceThreeTime());
 			priceBank.setUpdateTime(new Date());
+			priceBank.setPriceTime(new Date());
 			priceBank.setUpdateUser(SecureUtil.getUserId());
 			baseMapper.updateById(priceBank);
 		}