ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
@@ -131,6 +131,12 @@ public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) { boolean result=serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate); if (result) { for(ServiceEthicalreviewopinions row: serviceEthicalreviewinitiate.getEthicalreviewopinionsList()){ if(ObjectUtils.isNotEmpty(row.getId())){ serviceEthicalreviewopinionsService.updateById(row); } } return AjaxResult.success(); } else return AjaxResult.error(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -101,7 +101,7 @@ return AjaxResult.success(serviceEthicalreviewopinions); } @ApiOperation("伦理审查专家意见") @ApiOperation("修改伦理审查专家意见") /** * 修改伦理审查专家意见 */ @@ -111,11 +111,11 @@ // @RepeatSubmit public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) { boolean res=serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions); if(res&&serviceEthicalreviewopinions.getExpertType().equals("1")){ if(res&&serviceEthicalreviewopinions.getExpertType().equals("主任委员")&&serviceEthicalreviewopinions.getReceiveStatus().equals("5")){ QueryWrapper<ServiceEthicalreviewinitiate> ethicalreviewinitiateQueryWrapper=new QueryWrapper<>(); ethicalreviewinitiateQueryWrapper.eq("id",serviceEthicalreviewopinions.getNitiateId()); ServiceEthicalreviewinitiate serviceEthicalreviewinitiate =new ServiceEthicalreviewinitiate(); serviceEthicalreviewinitiate.setStatus("2"); serviceEthicalreviewinitiate.setStatus("3"); res=serviceEthicalreviewinitiateService.update(serviceEthicalreviewinitiate,ethicalreviewinitiateQueryWrapper); } return toAjax(res); ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -8,6 +8,8 @@ import com.ruoyi.project.domain.BaseOnlyvalue; import com.ruoyi.project.service.IBaseOnlyvalueService; import com.ruoyi.web.controller.common.OnlyValueCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; @@ -36,6 +38,7 @@ * @date 2021-11-24 */ @RestController @Api(description = "外围单位人员",tags={"外围单位人员"}) @RequestMapping("/project/externalperson") public class ServiceExternalpersonController extends BaseController { @Autowired @@ -47,6 +50,7 @@ @Autowired private OnlyValueCommon onlyValueCommon; @ApiOperation("查询外围单位人员列表") /** * 查询外围单位人员列表 */ @@ -59,6 +63,7 @@ return getDataTable(list); } @ApiOperation("导出外围单位人员列表") /** * 导出外围单位人员列表 */ @@ -71,6 +76,7 @@ return util.exportExcel(list, "外围单位人员数据"); } @ApiOperation("获取外围单位人员详细信息") /** * 获取外围单位人员详细信息 */ @@ -80,6 +86,7 @@ return AjaxResult.success(serviceExternalpersonService.getById(id)); } @ApiOperation("新增外围单位人员") /** * 新增外围单位人员 */ @@ -97,6 +104,7 @@ return AjaxResult.success(serviceExternalperson); } @ApiOperation("修改外围单位人员") /** * 修改外围单位人员 */ @@ -108,6 +116,7 @@ return toAjax(serviceExternalpersonService.updateById(serviceExternalperson)); } @ApiOperation("删除外围单位人员") /** * 删除外围单位人员 */ @@ -118,7 +127,7 @@ return toAjax(serviceExternalpersonService.removeByIds(Arrays.asList(ids))); } @ApiOperation("获取外围单位人员详细信息") /** * 获取外围单位人员详细信息 */ ruoyi-admin/src/main/resources/application.yml
@@ -99,7 +99,7 @@ logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) # update-strategy: IGNORED #忽略为空 call-setters-on-nulls: true # PageHelper分页插件 #pagehelper: ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceEthicalreviewopinions.java
@@ -158,5 +158,9 @@ @ApiModelProperty("专家类型0普通1专家") @Excel(name = "专家类型0普通1专家") private String expertType; @ApiModelProperty("签名") @Excel(name = "签名") private String sigin; }
@@ -642,6 +642,8 @@ @Excel(name = "伦理审查id") private String nitiateId; @ApiModelProperty("签名") @Excel(name = "签名") private String sigin; } ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -102,7 +102,7 @@ se.expert_name as expertName, se.expert_opinion as expertOpinion, se.expert_time as expertTime, se.status as status, ifnull(se.status,0) as status, se.file_patch as filePatch, se.sigin FROM ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewopinionsMapper.xml
@@ -137,7 +137,8 @@ service_ethicalreviewopinions.organ_type as organ_type, service_ethicalreviewopinions.ConclusionOrder as conclusionorder, service_ethicalreviewopinions.nitiate_id as nitiateId, service_ethicalreviewopinions.expert_no as expertNo service_ethicalreviewopinions.expert_no as expertNo, service_ethicalreviewopinions.sigin as sigin FROM service_donatebaseinfo LEFT JOIN service_ethicalreviewopinions ON service_donatebaseinfo.ID = service_ethicalreviewopinions.InfoID
