lims后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
“zhuo”
2023-08-09 a2ce400cc0245707333ec187a860787afdca3dae 
 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java


ÎļþÃû´Ó inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportCheckController.java ÐÞ¸Ä


@@ -3,18 +3,18 @@




import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.yuanchu.limslaboratory.pojo.vo.ReportCheckVo;


import com.yuanchu.limslaboratory.service.ReportCheckService;


import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;


import com.yuanchu.limslaboratory.service.ReportAuditingService;


import com.yuanchu.limslaboratory.vo.Result;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import java.util.HashMap;


import java.util.Map;




@@ -29,13 +29,13 @@


 */


@Api(tags = "检验模块-->报告审核")


@RestController


@RequestMapping("/reportCheck")


public class ReportCheckController {


@RequestMapping("/reportAuditing")


public class ReportAuditingController {


    /**


     * æœåŠ¡å¯¹è±¡


     */


    @Autowired


    private ReportCheckService reportCheckService;


    @Resource


    private ReportAuditingService reportAuditingService;




    @ApiOperation("查询报告审核内容")


    @ApiImplicitParams(value = {


@@ -44,9 +44,9 @@


            @ApiImplicitParam(name = "status", value = "状态(为空=全部)", dataTypeClass = Integer.class),


            @ApiImplicitParam(name = "name", value = "搜索信息", dataTypeClass = String.class)


    })


    @GetMapping("/selectAllReportCheck")


    @GetMapping("/selectAllReportAuditing")


    public Result selectAllReportCheck(Integer page, Integer pageSize, Integer status, String name) {


        IPage<ReportCheckVo> reportPage = reportCheckService.selectAllReportCheck(new Page<Object>(page, pageSize), status, name);


        IPage<ReportAuditingVo> reportPage = reportAuditingService.selectAllReportAuditing(new Page<Object>(page, pageSize), status, name);


        Map<String, Object> map = new HashMap<>();


        map.put("total", reportPage.getTotal());


        map.put("row", reportPage.getRecords());