捐献基础表新增见证状态

sinake

6 天以前 c9d322390ffa1a58cb53837d5351e1b03199fffd

捐献基础表新增见证状态

 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-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/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/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/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