模块开发12

huimv-farm/src/main/java/vip/xiaonuo/quality/controller/QualityReagentInStockController.java

@@ -1,9 +1,23 @@
 package vip.xiaonuo.quality.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.quality.entity.QualityReagentInStock;
+import vip.xiaonuo.quality.entity.QualityReagentStock;
+import vip.xiaonuo.quality.param.QualityStockPageParam;
+import vip.xiaonuo.quality.service.IQualityReagentInStockService;
 
 /**
  * <p>
@@ -15,6 +29,32 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/quality-reagent-in-stock")
+@Api(tags = "质量试剂入库")
+@ApiSupport(author = "wang", order = 1)
+@Validated
 public class QualityReagentInStockController {
 
+    @Autowired
+    private IQualityReagentInStockService inStockService;
+
+    @PostMapping("/quality-reagent-stock/add")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("质量试剂入库添加")
+    public CommonResult add(@RequestBody QualityReagentInStock inStock) {
+        return inStockService.add(inStock);
+    }
+
+    @PostMapping("/quality-reagent-stock/edit")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("质量试剂入库修改")
+    public CommonResult edit(@RequestBody QualityReagentInStock inStock) {
+        return inStockService.edit(inStock);
+    }
+
+    @PostMapping("/quality-reagent-stock/page")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("质量试剂入库分页")
+    public CommonResult<Page<QualityReagentInStock>> page(@RequestBody QualityStockPageParam stockPageParam) {
+        return CommonResult.data(inStockService.page(stockPageParam));
+    }
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/controller/QualityReagentStockController.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.quality.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -20,6 +21,9 @@ import vip.xiaonuo.quality.param.QualityParam;
 import vip.xiaonuo.quality.param.QualityStockPageParam;
 import vip.xiaonuo.quality.service.IQualityReagentStockService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 质量试剂仓库 前端控制器
@@ -59,4 +63,15 @@ public class QualityReagentStockController {
         return stockService.edit(qualityReagentStock);
     }
 
+
+    @PostMapping("/quality-reagent-stock/list")
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("质量试剂仓库列表")
+    public CommonResult<List<QualityReagentStock>> list(@RequestBody Map<String,String> paramsMap) {
+        String id = paramsMap.get("orgId");
+        QueryWrapper<QualityReagentStock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", id);
+        return CommonResult.data(stockService.list(queryWrapper));
+    }
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/param/QualityStockPageParam.java

@@ -16,4 +16,9 @@ public class QualityStockPageParam {
     @ApiModelProperty(value = "组织id", position = 3)
     private String orgId;
 
+
+    @ApiModelProperty(value = "试剂名称", position = 4)
+    private String reagent;
+
+
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityReagentInStockServiceImpl.java

@@ -85,8 +85,10 @@ public class QualityReagentInStockServiceImpl extends ServiceImpl<QualityReagent
         Integer pageSize = pageParam.getPageSize();
         Integer pageNum = pageParam.getPageNum();
         String orgId = pageParam.getOrgId();
+        String reagent = pageParam.getReagent();
         QueryWrapper<QualityReagentInStock> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
+        queryWrapper.eq(StringUtils.isNotBlank(reagent), "reagent", reagent);
         queryWrapper.orderByDesc("create_time");
         Page<QualityReagentInStock> page = new Page<>(pageNum, pageSize);
         return inStockMapper.selectPage(page,queryWrapper);