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

@@ -122,7 +122,7 @@
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfoVO);
        boolean save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
        long save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
        return AjaxResult.success(save);
    }


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

@@ -105,16 +105,16 @@
     * 新增捐献器官分配基础
     */
    @ApiOperation("新增捐献器官分配基础")
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceDonateorganBaseVO.class,
            serviceClass = IServiceDonateorganBaseService.class,
            message = "新增伦理审查的infoid已存在,无法保存!"
    )
//    @UniqueCheck(
//            fields = {"infoid"},
//            entityClass = ServiceDonateorganBaseVO.class,
//            serviceClass = IServiceDonateorganBaseService.class,
//            message = "新增伦理审查的infoid已存在,无法保存!"
//    )
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
        return toAjax(serviceDonateorganBaseService.add(serviceDonateorganBaseVO));
        return AjaxResult.success(serviceDonateorganBaseService.add(serviceDonateorganBaseVO));
    }

    /**

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

@@ -126,7 +126,7 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
        boolean save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
        long save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
        log.info("新增捐献见证是否成功：{},id为：{},infoId为：{}", save, serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
        return AjaxResult.success(save);
    }

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java

@@ -288,5 +288,12 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date coordinatorSignTime;

    /**
     * 见证状态1待获取、2进行中、3获取完成、4放弃
     */
    @ApiModelProperty("见证状态1待获取、2进行中、3获取完成、4放弃")
    @Excel(name = "见证状态1待获取、2进行中、3获取完成、4放弃")
    private String witnessState;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonationwitnessBaseInfoDTO.java

@@ -378,5 +378,12 @@

    @ApiModelProperty("器官列表集合")
    List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans;

    /**
     * 见证状态1待获取、2进行中、3获取完成、4放弃
     */
    @ApiModelProperty("见证状态1待获取、2进行中、3获取完成、4放弃")
    @Excel(name = "见证状态1待获取、2进行中、3获取完成、4放弃")
    private String witnessState;
}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonationwitnessVO.java

@@ -295,5 +295,11 @@
    @ApiModelProperty("捐献见证器官信息集合")
    private List<ServiceDonationwitnessorgan> serviceDonationwitnessorganList;

    /**
     * 见证状态1待获取、2进行中、3获取完成、4放弃
     */
    @ApiModelProperty("见证状态1待获取、2进行中、3获取完成、4放弃")
    @Excel(name = "见证状态1待获取、2进行中、3获取完成、4放弃")
    private String witnessState;
}


 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonatecompletioninfoService.java

@@ -27,7 +27,7 @@
     */
    public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);
    public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);

    public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);


 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganBaseService.java

@@ -43,7 +43,7 @@
    public List<ServiceDonateorganBase> exportQueryList(ServiceDonateorganBase serviceDonateorganBase);


    public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO);
    public long add(ServiceDonateorganBaseVO serviceDonateorganBaseVO);

    public Boolean updateByParam(ServiceDonateorganBaseVO serviceDonateorganBaseVO);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonationwitnessService.java

@@ -30,7 +30,7 @@

    public List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);

    public Boolean add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);
    public long add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);

    public Boolean edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java

@@ -81,7 +81,7 @@
    }

    @Override
    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
    public long add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
@@ -94,7 +94,7 @@
                }
            }
        }
        return b;
        return serviceDonatecompletioninfo.getId();
    }

    @Override
@@ -117,7 +117,7 @@
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);

        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() != null) {
            for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
                ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java

@@ -128,7 +128,7 @@
    }

    @Override
    public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
    public long add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
        ServiceDonateorganBase serviceDonateorganBase = DtoConversionUtils.sourceToTarget(serviceDonateorganBaseVO, ServiceDonateorganBase.class);
        boolean save = false;
        if (ObjectUtils.isNotEmpty(serviceDonateorganBase)) {
@@ -141,7 +141,7 @@
            }
        }

        return save;
        return serviceDonateorganBase.getId();
    }

    @Override

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java

@@ -86,7 +86,7 @@
    }

    @Override
    public Boolean add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
    public long add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
        ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
        boolean save = false;
        if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
@@ -99,7 +99,7 @@
                }
            }
        }
        return save;
        return serviceDonationwitness.getId();
    }

    @Override

 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml

@@ -47,6 +47,8 @@
        <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
        <result property="coordinatorSign" column="coordinator_sign"/>
        <result property="coordinatorSignTime" column="coordinator_sign_time"/>
        <result property="witnessState" column="witness_state"/>

    </resultMap>

    <sql id="selectServiceDonationwitnessVo">
@@ -91,7 +93,8 @@
               update_time,
               OrganDonation,
               OrganDonation_Other,
               donationcategory
               donationcategory,
               witness_state
        from service_donationwitness
    </sql>

@@ -153,7 +156,9 @@
        st.AortaPerfusionTime as aortaperfusiontime,
        st.OrganDonation as organdonation,
        st.OrganDonation_Other as organdonationOther,
        st.DonationCategory as donationcategory
        st.DonationCategory as donationcategory,
        st.DeathJudgeAnnex as deathjudgeannex,
        st.witness_state as witnessState
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID