功能开发

src/main/java/org/springblade/modules/jinchao/controller/CustomerController.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.modules.jinchao.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -35,6 +36,7 @@ import jakarta.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -221,4 +223,17 @@ public class CustomerController extends BladeController {
 	public R<List<CustomerEntity>> listForSelect(@RequestParam @NotNull Long createUserId) {
 		return service.listForSelect(createUserId);
 	}
+
+	@GetMapping("/selectList")
+	@ApiOperationSupport(order = 11)
+	@Operation(summary = "[客户]选择", description = "")
+	public R<List<CustomerEntity>> selectList() {
+		BladeUser user = AuthUtil.getUser();
+		LambdaQueryWrapper<CustomerEntity> wrapper = new LambdaQueryWrapper<>();
+		if(!user.getRoleName().equals("administrator")){
+			wrapper.eq(BaseEntity::getCreateUser,user.getUserId());
+		}
+		List<CustomerEntity> list = service.list(wrapper);
+		return R.data(list);
+	}
 }

src/main/java/org/springblade/modules/jinchao/controller/OrderController.java

@@ -273,7 +273,8 @@ public class OrderController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "获取待审批数量", description  = "获取待审批数量")
 	public R readyApproveCount() {
-		if(AuthUtil.getUser().getRoleName().equals("超级管理员") || AuthUtil.getUser().getRoleName().equals("系统管理员")){
+		BladeUser user = AuthUtil.getUser();
+		if(!user.getRoleName().equals("administrator")){
 			return R.data(-1);
 		}
 		Long count = orderService.count(Wrappers.<OrderEntity>lambdaQuery().eq(BaseEntity::getStatus, CommonEnum.STATUS_2.getCode()));

src/main/java/org/springblade/modules/jinchao/controller/WaterBillController.java

@@ -33,6 +33,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
+import org.springblade.common.cache.UserCache;
 import org.springblade.common.enums.CommonEnum;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.secure.BladeUser;
@@ -49,6 +50,7 @@ import org.springblade.modules.jinchao.pojo.vo.WaterBillVO;
 import org.springblade.modules.jinchao.service.IOrderService;
 import org.springblade.modules.jinchao.service.IWaterBillService;
 import org.springblade.modules.jinchao.wrapper.WaterBillWrapper;
+import org.springblade.modules.system.pojo.entity.User;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -114,10 +116,12 @@ public class WaterBillController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入waterBill")
 	public R save(@Valid @RequestBody WaterBillEntity waterBill) {
+		BladeUser bladeUser = AuthUtil.getUser();
+		User user = UserCache.getUser(bladeUser.getUserId());
 		OrderEntity order = orderService.getById(waterBill.getOrderId());
 		order.setIsWaterBill("1");
 		orderService.updateById(order);
-		waterBill.setCreateUserName(AuthUtil.getUser().getNickName());
+		waterBill.setCreateUserName(user.getRealName());
 		return R.status(waterBillService.save(waterBill));
 	}
 

src/main/java/org/springblade/modules/jinchao/pojo/entity/OrderProjectProductEntity.java

@@ -121,4 +121,10 @@ public class OrderProjectProductEntity extends TenantEntity {
 	 */
 	@Schema(description = "备注")
 	private String remarks;
+
+	/**
+	 * 倍率
+	 */
+	@Schema(description = "倍率")
+	private Double multiple;
 }

src/main/java/org/springblade/modules/jinchao/service/impl/OrderServiceImpl.java

@@ -98,20 +98,22 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, OrderEntity>
 	public Boolean saveOrder(OrderEntity order) {
 		BladeUser bladeUser = AuthUtil.getUser();
 		User user = UserCache.getUser(bladeUser.getUserId());
+		order.setId(null);
 		order.setCode(generateOrderCode(order));
 		order.setOrderDate(DateFormatUtils.format(new Date(),"yyyy-MM-dd"));
 		order.setRemittedAmount(new BigDecimal(0));
 		order.setCreateUserName(user.getRealName());
 		order.setCreateDeptName(SysCache.getDeptName(Long.parseLong(user.getDeptId())));
-		order.setContractPrice(order.getSellingPrice());
 
 		this.save(order);
 		List<OrderProjectEntity> orderProjectEntityList = order.getProjectList();
 		for(OrderProjectEntity project : orderProjectEntityList){
+			project.setId(null);
 			project.setOrderId(order.getId());
 			orderProjectService.save(project);
 			List<OrderProjectProductEntity> orderProjectProductEntityList = project.getProductList();
 			for(OrderProjectProductEntity product : orderProjectProductEntityList){
+				product.setId(null);
 				product.setOrderId(order.getId());
 				product.setProjectId(project.getId());
 				orderProjectProductService.save(product);
@@ -134,7 +136,9 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, OrderEntity>
 		//添加新的版本
 		order.setCode(generateOrderCode(order));
 		order.setId(null);
-		order.setContractPrice(order.getSellingPrice());
+		if(StringUtils.isEmpty(order.getOrderDate())){
+			order.setOrderDate(DateFormatUtils.format(new Date(),"yyyy-MM-dd"));
+		}
 		this.save(order);
 		List<OrderProjectEntity> orderProjectEntityList = order.getProjectList();
 		for(OrderProjectEntity project : orderProjectEntityList){
@@ -177,10 +181,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, OrderEntity>
 	@Override
 	public OrderEntity detail(OrderEntity order) {
 		order = this.getById(order.getId());
-		ExchangeRateEntity exchangeRate = exchangeRateService.getOne(Wrappers.<ExchangeRateEntity>lambdaQuery().eq(ExchangeRateEntity::getTargetCurrency,order.getMonetaryUnit()));
-		if(exchangeRate != null){
-			order.setDiscountAmount(order.getDiscountAmount().divide(exchangeRate.getRate(),0, RoundingMode.UP));
-		}
 		List<OrderProjectEntity> projectList = orderProjectService.list(Wrappers.<OrderProjectEntity>lambdaQuery().eq(OrderProjectEntity::getOrderId,order.getId()));
 		projectList.forEach(project ->{
 			List<OrderProjectProductEntity> productList = orderProjectProductService.list(Wrappers.<OrderProjectProductEntity>lambdaQuery().eq(OrderProjectProductEntity::getProjectId,project.getId()));

src/main/java/org/springblade/modules/jinchao/service/impl/ProductServiceImpl.java

@@ -214,6 +214,7 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
 				// 提取字段并做空值处理
 				String nameCn = vo.getNameCn();
 				String bizRemark = vo.getBizRemark();
+				String remarkCn = vo.getRemarkCn();
 				String nameCnFilter = map.get("nameCn") != null ? map.get("nameCn").toString() : null;
 				String bizRemarkFilter = map.get("bizRemark") != null ? map.get("bizRemark").toString() : null;
 				boolean needRemove = false;
@@ -222,7 +223,7 @@ public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, ProductEn
 					needRemove = (nameCn == null) || !nameCn.contains(nameCnFilter);
 				}
 				if (!needRemove && bizRemarkFilter != null) {
-					needRemove = (bizRemark == null) || !bizRemark.contains(bizRemarkFilter);
+					needRemove = (StringUtils.isEmpty(bizRemark) && StringUtils.isEmpty(remarkCn)) || (StringUtils.isNotEmpty(bizRemark) && !bizRemark.contains(bizRemarkFilter)) || (StringUtils.isNotEmpty(remarkCn) && !remarkCn.contains(bizRemarkFilter));
 				}
 
 				if (needRemove) {