2022年8月19日 19:38

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpsDescVO.java

@@ -21,6 +21,11 @@ import java.util.List;
 public class CorpsDescVO extends CorpsDesc {
 	private static final long serialVersionUID = 1L;
 	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String cname;
+	/**
 	 * 客户联系人
 	 */
 	@ApiModelProperty(value = "客户联系人")

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -28,6 +28,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.purchase.sales.entity.Order;
@@ -319,6 +320,7 @@ public class CorpsDescController extends BladeController {
 		LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted, 0);
+		lambdaQueryWrapper.like(StringUtil.isNotBlank(corpsDesc.getCname()), CorpsDesc::getCname, corpsDesc.getCname());
 
 		//获得客户信息
 		List<CorpsDesc> corpsDescList = corpsDescService.list(lambdaQueryWrapper);

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -518,7 +518,7 @@ public class GoodsDescController extends BladeController {
 		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.eq(GoodsDesc::getIsDeleted, 0);
-		lambdaQueryWrapper.eq(GoodsDesc::getGoodsTypeId, goodsTypeId);
+		lambdaQueryWrapper.eq(StringUtil.isNotBlank(goodsTypeId), GoodsDesc::getGoodsTypeId, goodsTypeId);
 		lambdaQueryWrapper.like(StringUtil.isNotBlank(cname), GoodsDesc::getCname, cname);
 		lambdaQueryWrapper.like(StringUtil.isNotBlank(typeno), GoodsDesc::getTypeno, typeno);
 		lambdaQueryWrapper.like(StringUtil.isNotBlank(brandItem), GoodsDesc::getBrandItem, brandItem);

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

@@ -1036,12 +1036,29 @@ public class ProjectController {
 
 		if (type.equals("RW")){
 			List<StatisticsExcel> excelList = new ArrayList<>();
-			if (ObjectUtil.isNotEmpty(list)){
-				excelList = BeanUtil.copy(list, StatisticsExcel.class);
-			}
+			list.forEach(e -> {
+				StatisticsExcel excel = new StatisticsExcel();
+				excel.setUserName(e.getUserName());
+				excel.setBeginTime(e.getBeginTime());
+				excel.setCornName(e.getCornName());
+				excel.setTaskName(e.getPName());
+				excel.setTaskStatus(e.getTaskStatus());
+				excelList.add(excel);
+			});
 			ExcelUtil.export(response, "任务统计", "任务统计", excelList, StatisticsExcel.class);
 		}else if (type.equals("TC")){
-			List<CommissionExcel> excelList = BeanUtil.copy(list, CommissionExcel.class);
+			List<CommissionExcel> excelList = new ArrayList<>();
+			if (ObjectUtil.isNotEmpty(list)) {
+				list.forEach(e -> {
+					CommissionExcel excel = new CommissionExcel();
+					excel.setUserName(e.getUserName());
+					excel.setBeginTime(e.getBeginTime());
+					excel.setCornName(e.getCornName());
+					excel.setTaskName(e.getPName());
+					excel.setCommission(e.getCommission());
+					excelList.add(excel);
+				});
+			}
 			ExcelUtil.export(response, "提成统计", "提成统计", excelList, CommissionExcel.class);
 		}else {
 			throw new RuntimeException("用户无导出权限！");

blade-service/blade-project/src/main/java/org/springblade/project/excel/CommissionExcel.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
@@ -29,7 +30,7 @@ public class CommissionExcel implements Serializable {
 	 */
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
 	@ExcelProperty(value = "业务日期")
-	private Data beginTime;
+	private Date beginTime;
 
 	/**
 	 * 客户名称
@@ -41,7 +42,7 @@ public class CommissionExcel implements Serializable {
 	 * 任务名称
 	 */
 	@ExcelProperty(value = "任务名称")
-	private String pname;
+	private String taskName;
 
 	/**
 	 * 提成金额

blade-service/blade-project/src/main/java/org/springblade/project/excel/StatisticsExcel.java

@@ -43,7 +43,7 @@ public class StatisticsExcel implements Serializable {
 	 * 任务名称
 	 */
 	@ExcelProperty(value = "任务名称")
-	private String pName;
+	private String taskName;
 
 	/**
 	 * 状态

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

@@ -732,5 +732,4 @@ public class OrderController extends BladeController {
 		return R.data(pages);
 	}
 
-
 }

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

@@ -186,9 +186,6 @@ public class PurchaseOrderController extends BladeController {
 			{
 				return R.data(Collections.EMPTY_LIST,"暂无相关数据");
 			}
-
-
-
 		}
 		//采购商
 		if(StringUtils.isNotBlank(strPurchaserName))
@@ -236,11 +233,11 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.orderByDesc("create_time");
 		Page<Order> page=new Page<>(current,size);
 		IPage<Order> pages = orderService.page(page,queryWrapper);
-//		List<Order> orderList = orderService.list(queryWrapper);
 		List<Order> records = pages.getRecords();
 		if(CollectionUtils.isNotEmpty(records))
 		{
 			records.forEach(e->{
+				//所属公司
 				if(e.getBelongToCorpId()!=null)
 				{
 					R<CorpsDesc> corpMessage3 = corpsDescClient.getCorpMessage(e.getBelongToCorpId());
@@ -308,18 +305,7 @@ public class PurchaseOrderController extends BladeController {
 						.filter(Objects::nonNull)
 						.reduce(BigDecimal.ZERO, BigDecimal::add);
 					e.setActualWeight(actualWeight);
-
-					orderItemsList.forEach(item -> {
-						//商品信息
-						R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
-						if(goodsDesc.isSuccess() && ObjectUtil.isNotEmpty(goodsDesc.getData()))
-						{
-							item.setGoodsName(goodsDesc.getData().getCname());
-						}
-					});
 				}
-
-				e.setItemsList(orderItemsList);
 			});
 		}
 		return R.data(pages);