乐山实验室
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
xuhy
昨天 1a2e22a27627b40689257442cc5a46598c634f8e 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java


@@ -17,12 +17,12 @@


import com.ruoyi.system.service.ISysUserService;


import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalDataService;


import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;


import com.ruoyi.system.service.TTestMethodConfirmSheetTermService;


import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.BeanUtils;


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


import org.springframework.security.access.prepost.PreAuthorize;


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




import java.util.List;


@@ -45,13 +45,15 @@


    private final SysUserMapper sysUserMapper;


    private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;


    private final TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService;


    private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService;


    @Autowired


    public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService) {


    public TTestMethodConfirmSheetOriginalController(TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService, TTestMethodConfirmSheetOriginalDataService testMethodConfirmSheetOriginalDataService, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService) {


        this.tokenService = tokenService;


        this.sysUserService = sysUserService;


        this.sysUserMapper = sysUserMapper;


        this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;


        this.testMethodConfirmSheetOriginalDataService = testMethodConfirmSheetOriginalDataService;


        this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService;


    }




    /**


@@ -91,14 +93,18 @@


    @ApiOperation(value = "查看检验方法确认单详情")


    @GetMapping(value = "/open/t-test-method-confirm-sheet-original/getDetailById")


    public R<TTestMethodConfirmSheetOriginalVO> getDetailById(@RequestParam String id) {


        TTestMethodConfirmSheetOriginal testMethodConfirmSheet = testMethodConfirmSheetOriginalService.getById(id);


        TTestMethodConfirmSheetOriginalVO testMethodConfirmSheetVO = new TTestMethodConfirmSheetOriginalVO();


        BeanUtils.copyProperties(testMethodConfirmSheet, testMethodConfirmSheetVO);


        TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = testMethodConfirmSheetOriginalService.getById(id);


        TTestMethodConfirmSheetOriginalVO testMethodConfirmSheetOriginalVO = new TTestMethodConfirmSheetOriginalVO();


        BeanUtils.copyProperties(testMethodConfirmSheetOriginal, testMethodConfirmSheetOriginalVO);




        // 查询检测项数据


        TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm = testMethodConfirmSheetTermService.getById(testMethodConfirmSheetOriginal.getTermId());


        testMethodConfirmSheetOriginalVO.setTestMethodConfirmSheetTerm(testMethodConfirmSheetTerm);




        // 查询检测数据


        List<TTestMethodConfirmSheetOriginalData> testMethodConfirmSheetOriginalDataList = testMethodConfirmSheetOriginalDataService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginalData.class).eq(TTestMethodConfirmSheetOriginalData::getOriginalId, id));


        testMethodConfirmSheetVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList);


        return R.ok(testMethodConfirmSheetVO);


        testMethodConfirmSheetOriginalVO.setTestMethodConfirmSheetOriginalDataList(testMethodConfirmSheetOriginalDataList);


        return R.ok(testMethodConfirmSheetOriginalVO);


    }




}