修改bug提交

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProject.java

@@ -114,4 +114,8 @@ public class ServiceProject extends TenantEntity implements Serializable {
 	private BigDecimal serviceCharge;
 
 	private BigDecimal matMoney;
+
+	//客户联系人名称
+	@TableField(exist = false)
+	private String corpNames;
 }

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProjectItem.java

@@ -111,7 +111,7 @@ public class ServiceProjectItem extends TenantEntity implements Serializable {
 	@TableField(exist = false)
 	private String strStatus;
 
-	@TableField(exist = false)
+
 	private String userName;
 
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -59,6 +59,7 @@ public class ProjectController {
 							@RequestParam(name = "size", defaultValue = "10") Integer size,
 							@RequestParam(name = "code", required = false) String code,
 							@RequestParam(name = "cname", required = false) String cName,
+							@RequestParam(name = "corpId", required = false) String corpId,
 							@RequestParam(name = "corpAttn", required = false) String corpAttn,
 							@RequestParam(name = "dutyName", required = false) String dutyName,
 							@RequestParam(name = "remark", required = false) String remark,
@@ -73,12 +74,25 @@ public class ProjectController {
 			.like(StringUtils.isNotBlank(corpAttn), ServiceProject::getCorpAttn, corpAttn)
 			.like(StringUtils.isNotBlank(cName), ServiceProject::getCName, cName)
 			.eq(StringUtils.isNotBlank(code), ServiceProject::getCode, code)
+			.eq(StringUtils.isNotBlank(corpId), ServiceProject::getCorpId, corpId)
 			.eq(ServiceProject::getIsDeleted, 0)
 			.orderByDesc(ServiceProject::getCreateTime);
 
 		Page<ServiceProject> page = new Page<>(current, size);
 		IPage<ServiceProject> iPage = serviceProjectService.page(page, serviceProjectLambdaQueryWrapper);
 		List<ServiceProject> records = iPage.getRecords();
+
+		//客户名称
+		records.forEach(e->{
+			if(corpsDescClient.getCorpMessage(e.getCorpId()).isSuccess())
+			{
+				e.setCorpNames(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
+			}
+
+		});
+
+
+
 		//检查是否可以删除主表,没有字表信息 或者 字表status全部为0 就可以删除
 		if(flag==0)
 		{
@@ -158,11 +172,11 @@ public class ProjectController {
 			serviceProjectItems.forEach(e->{
 
 				e.setStrStatus(str[e.getStatus()]);
-				R<User> r = userClient.userInfoById(e.getUserid());
+			/*	R<User> r = userClient.userInfoById(e.getUserid());
 				if(r.getData()!=null)
 				{
                  e.setUserName(r.getData().getRealName());
-				}
+				}*/
 			});
 			serviceProject.setItemList(serviceProjectItems);
 		}
@@ -210,6 +224,7 @@ public class ProjectController {
 
 		  LambdaQueryWrapper<ServiceProjectItem> itemLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		  itemLambdaQueryWrapper
+			  .like(StringUtils.isNotBlank(userName),ServiceProjectItem::getUserName,userName)
 			  .eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
 			  .between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),ServiceProjectItem::getCreateTime,createStartTime,createEndTime)
 			  .between(StringUtils.isNotBlank(payStartTime)&&StringUtils.isNotBlank(payEndTime),ServiceProjectItem::getPayTime,payStartTime,payEndTime)
@@ -270,11 +285,11 @@ public class ProjectController {
 				  }
 				  //承做人
 
-				  R<User> userR = userClient.userInfoById(e.getUserid());
+				 /* R<User> userR = userClient.userInfoById(e.getUserid());
 				  if(userR.isSuccess())
 				  {
 					  e.setUserName(userR.getData().getRealName());
-				  }
+				  }*/
 			  });
 		  }
 		  return R.data(iPage);
@@ -286,6 +301,12 @@ public class ProjectController {
        return serviceProjectService.getSysNo();
 	}
 
+	@GetMapping("getPidByItemId")
+	public R getPidByItemId( @RequestParam(name = "itemId",  required = true) Long itemId)
+	{
+		ServiceProjectItem projectItem = serviceProjectItemService.getById(itemId);
+		return R.data(projectItem.getPId());
+	}
 
 
 }

blade-service/store-goods/src/main/java/com/store/goods/controller/GoodsDescController.java

@@ -17,6 +17,7 @@
 package com.store.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -79,7 +80,17 @@ public class GoodsDescController extends BladeController {
 			.eq(GoodsItems::getPid,detail.getId())
 			.eq(GoodsItems::getTenantId, AuthUtil.getTenantId());
 		List<GoodsItems> itemsList = goodsItemsService.list(itemsLambdaQueryWrapper);
-	    if(CollectionUtils.isNotEmpty(itemsList))
+
+		//返回此商品是否已被收藏
+		LambdaQueryWrapper<GoodsRecord> goodsRecordLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getCategory,1);
+		goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getUserId,AuthUtil.getUserId());
+		goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getGoodsDescId,detail.getId());
+		goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getTenantId,AuthUtil.getTenantId());
+		GoodsRecord goodsRecord = goodsRecordService.getOne(goodsRecordLambdaQueryWrapper);
+		detail.setIsCollection(goodsRecord==null?false:true);
+
+		if(CollectionUtils.isNotEmpty(itemsList))
 	    {
 			//最低价
 			BigDecimal lowPrice = itemsList.stream()
@@ -120,11 +131,27 @@ public class GoodsDescController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
 	public R<IPage<GoodsDesc>> list(GoodsDesc goodsDesc, Query query) {
-		IPage<GoodsDesc> pages = goodsDescService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsDesc));
+		QueryWrapper<GoodsDesc> queryWrapper = Condition.getQueryWrapper(goodsDesc);
+		//按字段排序
+		if(StringUtils.isNotBlank(goodsDesc.getSortColumn()))
+		{
+			queryWrapper.orderByDesc(goodsDesc.getSortColumn());
+		}
+		IPage<GoodsDesc> pages = goodsDescService.page(Condition.getPage(query), queryWrapper);
 		List<GoodsDesc> records = pages.getRecords();
 		if(CollectionUtils.isNotEmpty(records))
 		{
 			records.forEach(e->{
+				//返回此商品是否已被收藏
+				LambdaQueryWrapper<GoodsRecord> goodsRecordLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getCategory,1);
+				goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getUserId,AuthUtil.getUserId());
+				goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getGoodsDescId,e.getId());
+				goodsRecordLambdaQueryWrapper.eq(GoodsRecord::getTenantId,AuthUtil.getTenantId());
+				GoodsRecord goodsRecord = goodsRecordService.getOne(goodsRecordLambdaQueryWrapper);
+				e.setIsCollection(goodsRecord==null?false:true);
+
+				//商品规格相关
 				LambdaQueryWrapper<GoodsItems> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 				itemsLambdaQueryWrapper
 					.eq(GoodsItems::getIsDeleted,0)

blade-service/store-goods/src/main/java/com/store/goods/entity/GoodsDesc.java

@@ -126,4 +126,11 @@ public class GoodsDesc implements Serializable {
 		@TableField(exist = false)
 		private BigDecimal highPrice;
 
+		@ApiModelProperty(value = "排序字段")
+		@TableField(exist = false)
+		private String sortColumn;
+
+		@ApiModelProperty(value = "是否被收藏关注")
+		@TableField(exist = false)
+		private Boolean isCollection;
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -37,6 +37,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -70,6 +72,8 @@ public class PurchaseOrderController extends BladeController {
 
     private IGoodsDescClient goodsDescClient;
 
+    private IUserClient userClient;
+
 
 	/**
 	 * 详情
@@ -166,6 +170,17 @@ public class PurchaseOrderController extends BladeController {
 		if(CollectionUtils.isNotEmpty(records))
 		{
 			records.forEach(e->{
+
+				//制单人名字
+				if(e.getCreateUser()!=null)
+				{
+					R<User> userR = userClient.userInfoById(e.getCreateUser());
+					if(userR.isSuccess())
+					{
+						e.setCreateUserName(userR.getData().getRealName());
+					}
+				}
+
 				//获取供应商中文名
 				if (e.getCorpId() != null){
 					R<CorpsDesc> corpMessage1 = corpsDescClient.getCorpMessage(e.getCorpId());