Browse Source

产能控制 查询显示

liuchaohui 2 years ago
parent
commit
7aa7c919aa

+ 2 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/controller/SyCapacityControlController.java

@@ -62,13 +62,11 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr
 	//@AutoLog(value = "产能控制-分页列表查询")
 	@ApiOperation(value="产能控制-分页列表查询", notes="产能控制-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<SyCapacityControl>> queryPageList(SyCapacityControl syCapacityControl,
+	public Result<List<SyCapacityControl>> queryPageList(String supplier,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<SyCapacityControl> queryWrapper = QueryGenerator.initQueryWrapper(syCapacityControl, req.getParameterMap());
-		Page<SyCapacityControl> page = new Page<SyCapacityControl>(pageNo, pageSize);
-		IPage<SyCapacityControl> pageList = syCapacityControlService.page(page, queryWrapper);
+		List<SyCapacityControl> pageList = syCapacityControlService.query(supplier,pageNo,pageSize);
 		return Result.OK(pageList);
 	}
 	

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/SyCapacityControlMapper.java

@@ -4,6 +4,8 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * @Description: 产能控制
  * @Author: jeecg-boot
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface SyCapacityControlMapper extends BaseMapper<SyCapacityControl> {
     @Override
     int insert(@Param("entity") SyCapacityControl entity);
+
+    List<SyCapacityControl> query(@Param("supplier")String supplier,@Param("pageIndex")Integer pageIndex,
+                                  @Param("pageSize")Integer pageSize);
 }

+ 11 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/xml/SyCapacityControlMapper.xml

@@ -7,4 +7,15 @@
         values (#{entity.supplier},#{entity.supplierCode},#{entity.capacityQuota},#{entity.workingHours},#{entity.capacitySection},
                 #{entity.supplierState},#{entity.remarks},#{entity.state});
     </insert>
+
+    <select id="query" resultType="org.jeecg.modules.capacity.entity.SyCapacityControl">
+        select
+        id,supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state from sy_capacity_control
+        <if test="supplier != null">
+            where supplier=#{supplier}
+        </if>
+        order by id desc
+        offset #{pageIndex} rows
+        fetch next #{pageSize} rows only
+    </select>
 </mapper>

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/ISyCapacityControlService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.capacity.service;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 产能控制
  * @Author: jeecg-boot
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISyCapacityControlService extends IService<SyCapacityControl> {
     int insert( SyCapacityControl entity);
+    List<SyCapacityControl> query(String supplier, Integer pageIndex,Integer pageSize);
 }

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/impl/SyCapacityControlServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 产能控制
  * @Author: jeecg-boot
@@ -27,4 +29,10 @@ public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlM
     public int insert(SyCapacityControl entity) {
         return syCapacityControlMapper.insert(entity);
     }
+
+    @Override
+    public List<SyCapacityControl> query(String supplier, Integer pageIndex, Integer pageSize) {
+        pageIndex=(pageIndex-1)*pageSize;
+        return syCapacityControlMapper.query(supplier, pageIndex, pageSize);
+    }
 }