新增InfoID获取伦理审查发起详细信息挡口,获取捐献工作流新增7个状态字段数据

sinake

6 天以前 0d45c29b4d4b043342f39a9a03fb0cc8162f4ef7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java

@@ -92,7 +92,28 @@
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getById(id);
        QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
        ethicalreviewopinionsWrapper.eq("nitiate_Id",id);
        List<ServiceEthicalreviewopinions>  ethicalreviewopinionsList= serviceEthicalreviewopinionsService.list(ethicalreviewopinionsWrapper);
        serviceEthicalreviewinitiate.setEthicalreviewopinionsList(ethicalreviewopinionsList);
        return AjaxResult.success(serviceEthicalreviewinitiate);
    }

    /**
     * 获取伦理审查发起详细信息
     */
    @ApiOperation("InfoID获取伦理审查发起详细信息")
    @GetMapping(value = "/getInfoID")
    public AjaxResult getInfoId(Long InfoId) {
        QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>();
        ethicalreviewinitiateQueryWrapper.eq("InfoId",InfoId);
        ServiceEthicalreviewinitiate serviceEthicalreviewinitiate= serviceEthicalreviewinitiateService.getOne(ethicalreviewinitiateQueryWrapper);
        if(serviceEthicalreviewinitiate!=null&&serviceEthicalreviewinitiate.getId()!=null) {
            QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper = new QueryWrapper<>();
            ethicalreviewopinionsWrapper.eq("nitiate_Id", serviceEthicalreviewinitiate.getId());
            List<ServiceEthicalreviewopinions> ethicalreviewopinionsList = serviceEthicalreviewopinionsService.list(ethicalreviewopinionsWrapper);
            serviceEthicalreviewinitiate.setEthicalreviewopinionsList(ethicalreviewopinionsList);
        }
        return AjaxResult.success(serviceEthicalreviewinitiate);
    }

@@ -131,11 +152,11 @@
    public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate);
        if (result) {
            QueryWrapper<ServiceEthicalreviewopinions> ethicalreviewopinionsWrapper=new QueryWrapper<>();
            ethicalreviewopinionsWrapper.eq("nitiate_id",serviceEthicalreviewinitiate.getId());
            serviceEthicalreviewopinionsService.remove(ethicalreviewopinionsWrapper);
            for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){
                if(ObjectUtils.isNotEmpty(row.getId())){
                    serviceEthicalreviewopinionsService.updateById(row);
                }

                    serviceEthicalreviewopinionsService.save(row);
            }
            return AjaxResult.success();
        } else