申购添加数据过滤

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/dto/SubscribeDetailSelectDto.java

@@ -64,7 +64,6 @@ public class SubscribeDetailSelectDto extends BaseSelectDto {
     private String productName;
 
 
-
     /**
      * 申购编码
      */
@@ -74,4 +73,9 @@ public class SubscribeDetailSelectDto extends BaseSelectDto {
      * 申购状态 0草稿 10、审批中；20、驳回  30、通过
      */
     private Integer subscribeStatus;
+
+    /**
+     * 数据类型 0申购 1销售合同
+     */
+    private Integer dataType;
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -100,6 +100,11 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 		if (StrUtil.isNotBlank(dto.getNeStatus())) {
 			wrapper.notIn("t2", SubscribeDetail::getStatus, dto.getNeStatus().split(","));
 		}
+
+		wrapper.eq("t2", SubscribeDetail::getDataType, dto.getDataType());
+
+		//按类型倒序 先显示合同数据 再显示申购数据
+		wrapper.orderByDesc("t2", SubscribeDetail::getDataType);
 		wrapper.orderByDesc("t2", SubscribeDetail::getCreateTime);
 
 		Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -121,6 +126,10 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 			s.setProductDefinition(productInfo.getDefinition());
 			s.setProductCustomCode(productInfo.getCustomCode());
 			s.setProductSpec(productInfo.getSpec());
+
+			s.setProductLength(productInfo.getLength());
+			s.setProductWidth(productInfo.getWidth());
+			s.setProductHeight(productInfo.getHeight());
 		}
 
 		// 赋值采购数量