src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java
@@ -66,6 +66,17 @@ } /** * 自定义分页 */ @GetMapping("/pages") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入farmProductStock") public R<List<FarmProductStockVO>> pages(FarmProductStockVO farmProductStock) { List<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPages(farmProductStock); return R.data(pages); } /** * 统计产量 * * @param farmProductStock src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.java
@@ -25,6 +25,7 @@ * @return */ List<FarmProductStockVO> selectFarmProductStockPage(@Param("page") IPage page, @Param("farmProductStock") FarmProductStockVO farmProductStock); List<FarmProductStockVO> selectFarmProductStockPages(@Param("farmProductStock") FarmProductStockVO farmProductStock); /** * 统计产量 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -29,6 +29,32 @@ group by sfps.strain_id,ss.url,ss.strain_name </select> <select id="selectFarmProductStockPages" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO"> select sfps.strain_id strainId,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from sys_farm_product_stock sfps left join sys_strain ss on ss.id = sfps.strain_id where 1=1 <if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''"> and sfps.strain_id = #{farmProductStock.strainId} </if> <if test="farmProductStock.leaves!=null and farmProductStock.leaves!=''"> and sfps.leaves = #{farmProductStock.leaves} </if> <if test="farmProductStock.startTime!=null and farmProductStock.startTime!=''"> and sfps.time >= #{farmProductStock.startTime} </if> <if test="farmProductStock.endTime!=null and farmProductStock.endTime!=''"> and sfps.time <= #{farmProductStock.endTime} </if> <if test="farmProductStock.deptId!=null and farmProductStock.deptId!=''"> and sfps.dept_id = #{farmProductStock.deptId} </if> <if test="farmProductStock.tenantId!=null and farmProductStock.tenantId!=''"> and sfps.tenant_id = #{farmProductStock.tenantId} </if> group by sfps.strain_id,ss.url,ss.strain_name </select> <!--查询农产品库存数据--> <select id="statisticsProduct" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO"> src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java
@@ -24,6 +24,7 @@ * @return */ IPage<FarmProductStockVO> selectFarmProductStockPage(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock); List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock); /** * 统计产量 src/main/java/org/springblade/modules/farmplant/service/impl/FarmProductStockServiceImpl.java
@@ -30,6 +30,11 @@ return page.setRecords(baseMapper.selectFarmProductStockPage(page, farmProductStock)); } @Override public List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock) { return baseMapper.selectFarmProductStockPages(farmProductStock); } /** * 统计产量 * @param farmProductStock src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java
@@ -35,6 +35,8 @@ import org.springblade.modules.stockfactory.service.IStockfactoryService; import org.springblade.core.boot.ctrl.BladeController; import java.util.List; /** * 农资厂家表 控制器 * @@ -81,6 +83,16 @@ IPage<StockfactoryVO> pages = stockfactoryService.selectStockfactoryPage(Condition.getPage(query), stockfactory); return R.data(pages); } /** * 自定义分页 农资厂家表 */ @GetMapping("/pages") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入stockfactory") public R<List<StockfactoryVO>> pages(StockfactoryVO stockfactory) { List<StockfactoryVO> pages = stockfactoryService.selectStockfactoryPages(stockfactory); return R.data(pages); } /** * 新增 农资厂家表 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java
@@ -38,6 +38,7 @@ * @return */ List<StockfactoryVO> selectStockfactoryPage(IPage page, StockfactoryVO stockfactory); List<StockfactoryVO> selectStockfactoryPages( StockfactoryVO stockfactory); List selectStockFa(); List selectStockIn(); } src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml
@@ -24,6 +24,11 @@ from sys_stockfactory where is_deleted = 0 </select> <select id="selectStockfactoryPages" resultMap="stockfactoryResultMap"> select * from sys_stockfactory where is_deleted = 0 </select> <select id="selectStockFa" resultType="java.util.HashMap"> select id as dictKey, agricultural_name as dictValue src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java
@@ -39,6 +39,7 @@ * @return */ IPage<StockfactoryVO> selectStockfactoryPage(IPage<StockfactoryVO> page, StockfactoryVO stockfactory); List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory); List selectStockFa(); List selectStockIn(); } src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java
@@ -41,6 +41,11 @@ } @Override public List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory) { return baseMapper.selectStockfactoryPages(stockfactory); } @Override public List selectStockFa() { return baseMapper.selectStockFa(); }