提交采购条件代码

src/main/java/com/chinaitop/depot/device/controller/BusinessImPurchaseSaleController.java

@@ -7,6 +7,7 @@ import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleEditParam;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSalePageParam;
 import com.chinaitop.depot.device.service.BusinessImPurchaseSaleService;
 import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,7 @@ public class BusinessImPurchaseSaleController {
 
     @GetMapping("/getList")
     @ApiOperation(value = "查询 采购销售管理 信息列表", notes = "查询 采购销售管理 信息列表")
-    public ResponseEntity<Page<BusinessImPurchaseSale>> getList(BusinessImPurchaseSalePageParam pageParam) {
+    public ResponseEntity<PageInfo<BusinessImPurchaseSale>> getList(@Validated BusinessImPurchaseSalePageParam pageParam) {
 
         return ResponseEntity.ok(businessImPurchaseSaleService.getList(pageParam));
     }

src/main/java/com/chinaitop/depot/device/mapper/BusinessImPurchaseSaleMapper.java

@@ -7,6 +7,8 @@ import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 智能管理-综合业务管理-采购销售管理表 Mapper 接口
@@ -18,8 +20,9 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BusinessImPurchaseSaleMapper extends BaseMapper<BusinessImPurchaseSale> {
 
-    Page<BusinessImPurchaseSale> getList(@Param("purchaseCode") String purchaseCode,
-                                         @Param("purchasePlanName") String purchasePlanName);
+    List<BusinessImPurchaseSale> getList(@Param("purchaseCode") String purchaseCode,
+                                         @Param("purchasePlanName") String purchasePlanName,
+                                         @Param("orgId") Integer orgId);
 
     //int insertBusinessImPurchaseSale(BusinessImPurchaseSale businessImPurchaseSale);
 

src/main/java/com/chinaitop/depot/device/mapper/BusinessImPurchaseSaleMapper.xml

@@ -40,6 +40,7 @@
     <select id="getList" resultType="com.chinaitop.depot.device.model.BusinessImPurchaseSale">
         select * from business_im_purchase_sale
         <where>
+            org_id in (#{orgId})
             <if test="purchaseCode!=null and purchaseCode!=''">
                 and purchase_code like concat("%",#{purchaseCode},"%")
             </if>

src/main/java/com/chinaitop/depot/device/model/param/BusinessImPurchaseSalePageParam.java

@@ -2,6 +2,9 @@ package com.chinaitop.depot.device.model.param;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author hjc
  * @version 1.0
@@ -11,31 +14,42 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class BusinessImPurchaseSalePageParam {
 
-    /** 当前页 */
+    /**
+     * 当前页
+     */
     @ApiModelProperty(value = "页码")
     private Integer pageNum;
 
-    /** 每页条数 */
+    /**
+     * 每页条数
+     */
     @ApiModelProperty(value = "每页条数")
     private Integer pageSize;
 
-    /** 采购编号 */
+    /**
+     * 采购编号
+     */
     @ApiModelProperty(value = "采购编号", position = 7)
     private String purchaseCode;
 
-    /** 采购计划名称 */
+    /**
+     * 采购计划名称
+     */
     @ApiModelProperty(value = "采购计划名称", position = 8)
     private String purchasePlanName;
 
-    /** 采购编号 */
+    /**
+     * 采购编号
+     */
     @ApiModelProperty(value = "组织id", position = 9)
-    private String orgId;
+    @NotNull(message = "组织id不能为空")
+    private Integer orgId;
 
-    public String getOrgId() {
+    public Integer getOrgId() {
         return orgId;
     }
 
-    public void setOrgId(String orgId) {
+    public void setOrgId(Integer orgId) {
         this.orgId = orgId;
     }
 

src/main/java/com/chinaitop/depot/device/service/BusinessImPurchaseSaleService.java

@@ -7,6 +7,7 @@ import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleAddParam;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleEditParam;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSalePageParam;
 import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
 
 /**
  * <p>
@@ -24,7 +25,7 @@ public interface BusinessImPurchaseSaleService extends IService<BusinessImPurcha
      * @param:
      * @return: 查询 采购销售管理 信息列表
      */
-    Page<BusinessImPurchaseSale> getList(BusinessImPurchaseSalePageParam pageParam);
+    PageInfo<BusinessImPurchaseSale> getList(BusinessImPurchaseSalePageParam pageParam);
 
     /**
      * @author: hujianchun

src/main/java/com/chinaitop/depot/device/service/impl/BusinessImPurchaseSaleServiceImpl.java

@@ -9,6 +9,7 @@ import com.chinaitop.depot.device.model.param.BusinessImPurchaseSalePageParam;
 import com.chinaitop.depot.device.service.BusinessImPurchaseSaleService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,6 +18,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,12 +42,14 @@ public class BusinessImPurchaseSaleServiceImpl extends ServiceImpl<BusinessImPur
 
 
     @Override
-    public Page<BusinessImPurchaseSale> getList(BusinessImPurchaseSalePageParam pageParam) {
+    public PageInfo<BusinessImPurchaseSale> getList(BusinessImPurchaseSalePageParam pageParam) {
 
         PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
 
-        return businessImPurchaseSaleMapper.getList(pageParam.getPurchaseCode(), pageParam.getPurchasePlanName());
+        List<BusinessImPurchaseSale> list= businessImPurchaseSaleMapper.getList(pageParam.getPurchaseCode(), pageParam.getPurchasePlanName(),pageParam.getOrgId());
 
+        PageInfo<BusinessImPurchaseSale> page = new PageInfo<>(list);
+        return page;
 
     }