优化

platform-dao/src/main/java/com/platform/dao/dto/longyanpurchaseorder/LongYanPurchaseDetailDTO.java

@@ -23,6 +23,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailDTO extends BaseDTO implements Serializable {
+    private String sbName;
+    private String positionNo;
     private String storeName;
     private String storePosition;
 

platform-dao/src/main/java/com/platform/dao/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.java

@@ -17,6 +17,7 @@ import java.util.List;
  */
 @Component
 public interface LongYanPurchaseDetailMapper extends MyMapper<LongYanPurchaseDetail> {
+    List<LongYanPurchaseDetailVO> getDetails(LongYanPurchaseDetailDTO detailDTO);
     List<SpareChartsFifityVO> getSpareNumChartsFifity(LongYanPurchaseDetailDTO detailDTO);
     /**
      * 分页查询

platform-dao/src/main/java/com/platform/dao/vo/query/longyanpurchaseorder/LongYanPurchaseDetailVO.java

@@ -22,6 +22,7 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class LongYanPurchaseDetailVO extends BaseVO implements Serializable{
+    private String sbInfo;
     private String storeName;
     private String storePosition;
 

platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseDetailMapper.xml

@@ -99,4 +99,21 @@
 GROUP BY spare_id
 ORDER BY totalNum DESC
     </select>
+
+    <select id="getDetails" parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseDetailDTO"
+            resultType="com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseDetailVO">
+        SELECT menu.*,CONCAT(info.position_no,',',info.name) AS sbInfo
+        FROM t_long_yan_purchase_detail detail LEFT JOIN t_long_yan_purchase_order `order`
+        ON order.id = detail.long_yang_purchase_order_id
+        LEFT JOIN t_sb_info info ON info.id = order.sb_id
+        <where>
+            <include refid="List_Condition" />
+            <if test="sbName!=null and sbName!=null">
+                and info.name like concat('%',#{sbName},'%')
+            </if>
+            <if test="positionNo!=null and positionNo!=null">
+                and info.position_no like concat('%',#{positionNo},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/longyanpurchaseorder/LongYanPurchaseDetailController.java

@@ -143,4 +143,9 @@ public class LongYanPurchaseDetailController {
     return new R(longYanPurchaseDetailService.getSpareNumChartsFifity(longYanPurchaseDetailDTO,pageNum,pageSize));
   }
 
+  @GetMapping("/get/record")
+  public R getDetails(LongYanPurchaseDetailDTO longYanPurchaseDetailDTO , @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    return new R(longYanPurchaseDetailService.getDetails(longYanPurchaseDetailDTO,pageNum,pageSize));
+  }
+
 }

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/LongYanPurchaseDetailService.java

@@ -15,6 +15,7 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface LongYanPurchaseDetailService extends IBaseService<LongYanPurchaseDetail, LongYanPurchaseDetailDTO> {
+    AbstractPageResultBean<LongYanPurchaseDetailVO> getDetails(LongYanPurchaseDetailDTO detailDTO,Integer pageNum, Integer pageSize);
     AbstractPageResultBean<SpareChartsFifityVO> getSpareNumChartsFifity(LongYanPurchaseDetailDTO detailDTO, Integer pageNum, Integer pageSize);
 
    /**

platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseDetailServiceImpl.java

@@ -28,6 +28,12 @@ import java.util.List;
 @Service("longYanPurchaseDetailService")
 public class LongYanPurchaseDetailServiceImpl extends BaseServiceImpl<LongYanPurchaseDetailMapper, LongYanPurchaseDetail, LongYanPurchaseDetailDTO> implements LongYanPurchaseDetailService {
 
+    @Override
+    public AbstractPageResultBean<LongYanPurchaseDetailVO> getDetails(LongYanPurchaseDetailDTO detailDTO, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        return new MyPage<>(mapper.getDetails(detailDTO));
+    }
+
     @Override
     public AbstractPageResultBean<SpareChartsFifityVO> getSpareNumChartsFifity(LongYanPurchaseDetailDTO detailDTO, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum,pageSize);