提交代码

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/CorpsExcel.java

@@ -22,7 +22,8 @@ public class CorpsExcel implements Serializable {
 	@ExcelProperty("客户名称(必填)")
 	private String cname;
 
-
+	@ExcelProperty("客户分类(必填)")
+	private String type;
 
 	@ExcelProperty("英文名")
 	private String enname;
@@ -42,8 +43,6 @@ public class CorpsExcel implements Serializable {
 	@ExcelProperty("职位")
 	private String position;
 
-	@ExcelProperty("客户分类(必填)")
-	private String type;
 
 	@ExcelProperty("联系人")
 	private String attn;

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -199,6 +199,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 					corpsDesc.setBelongtoarea(e.getBelongtoarea());
 					corpsDesc.setCompanytype(e.getCompanytype());
 					corpsDesc.setPosition(e.getPosition());
+					corpsDesc.setCorpsTypeId(String.valueOf(corpsType.getId()));
 					//名称相等视为重复数据
 					LambdaQueryWrapper<CorpsDesc> queryWrapper = new LambdaQueryWrapper<>();
 					queryWrapper.eq(CorpsDesc::getCname,corpsDesc.getCname());
@@ -213,7 +214,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 
 						CorpsTypeDesc middle=new CorpsTypeDesc();
 						middle.setCorpId(corpsDesc.getId());
-						middle.setCorpTypeId(Long.valueOf(e.getTypeId()));
+						middle.setCorpTypeId(corpsType.getId());
 						middle.setCreateTime(new Date());
 						middle.setCreateUser(AuthUtil.getUserId());
 						middle.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsExcel.java

@@ -21,6 +21,9 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("商品名称(必填)")
 	private String cname;
 
+	@ExcelProperty("分类(必填)")
+	private String type;
+
 	@ExcelProperty("英文名称")
 	private String ename;
 
@@ -54,9 +57,6 @@ public class GoodsExcel implements Serializable {
 	@ExcelProperty("规格尺寸")
 	private String specs;
 
-	@ExcelProperty("分类(必填)")
-	private String type;
-
 
 	@ExcelProperty("产品类型")
 	private String category;

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

@@ -37,6 +37,7 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -82,7 +83,7 @@ public class PurchaseOrderController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "采购订单表列表(内贸 外贸 出口)", notes = "传入order")
-	public R<IPage<Order>> list( @RequestParam(name = "current", defaultValue = "1") Integer current,
+	public R<?> list( @RequestParam(name = "current", defaultValue = "1") Integer current,
 								 @RequestParam(name = "size", defaultValue = "10") Integer size,
 								 @RequestParam(value = "strCorpName",required = false) String strCorpName,//供应商名称
 								 @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
@@ -110,10 +111,16 @@ public class PurchaseOrderController extends BladeController {
 				List<Long> corpIds = corpsDescs.stream().map(CorpsDesc::getId).collect(Collectors.toList());
 				queryWrapper.in("corp_id",corpIds);
 			}
+			else
+			{
+				return R.data(Collections.EMPTY_LIST,"暂无相关数据");
+			}
+
+
 
 		}
 		//采购商
-		if(StringUtils.isBlank(strPurchaserName))
+		if(StringUtils.isNotBlank(strPurchaserName))
 		{
 			List<CorpsDesc> corpsDescs = corpsDescClient.listCorpByName(strPurchaserName);
 			if(CollectionUtils.isNotEmpty(corpsDescs))
@@ -121,6 +128,11 @@ public class PurchaseOrderController extends BladeController {
 				List<Long> purchaserIds = corpsDescs.stream().map(CorpsDesc::getId).collect(Collectors.toList());
 				queryWrapper.in("purchaser_id",purchaserIds);
 			}
+            else
+			{
+				return R.data(Collections.EMPTY_LIST,"暂无相关数据");
+			}
+
 		}
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.eq("bill_type",OrderTypeEnum.PURCHASE.getType());