ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecompletioninfo.java
@@ -128,6 +128,11 @@ @Excel(name = "捐献器官") private String donateorgan; /** * 完成状态1待利用，2进行中，3捐献完成，4放弃 */ @ApiModelProperty("完成状态1待利用，2进行中，3捐献完成，4放弃") @Excel(name = "完成状态1待利用，2进行中，3捐献完成，4放弃") private String completeState; }
@@ -208,4 +208,11 @@ @ApiModelProperty("捐献器官移植详情") private List<ServiceDonatecomporgan> serviceDonatecomporganList; /** * 完成状态1待利用，2进行中，3捐献完成，4放弃 */ @ApiModelProperty("完成状态1待利用，2进行中，3捐献完成，4放弃") @Excel(name = "完成状态1待利用，2进行中，3捐献完成，4放弃") private String completeState; } ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonatecompletioninfoVO.java
@@ -132,5 +132,12 @@ @ApiModelProperty("捐献器官移植表") private List<ServiceDonatecomporgan> serviceDonatecomporganList; /** * 完成状态1待利用，2进行中，3捐献完成，4放弃 */ @ApiModelProperty("完成状态1待利用，2进行中，3捐献完成，4放弃") @Excel(name = "完成状态1待利用，2进行中，3捐献完成，4放弃") private String completeState; }
@@ -8,7 +8,7 @@ <result property="id" column="ID"/> <result property="infoid" column="InfoID"/> <result property="donorno" column="DonorNo"/> <result property="del_flag" column="del_flag"/> <result property="delFlag" column="del_flag"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="updateBy" column="update_by"/> @@ -25,6 +25,7 @@ <result property="coordinatedusernamet" column="CoordinatedUserNameT"/> <result property="assessannex" column="AssessAnnex"/> <result property="donateorgan" column="DonateOrgan"/> <result property="completeState" column="complete_state"/> </resultMap> <sql id="selectServiceDonatecompletioninfoVo"> @@ -47,7 +48,8 @@ CoordinatedUserIDT, CoordinatedUserNameT, AssessAnnex, DonateOrgan DonateOrgan, complete_state from service_donatecompletioninfo </sql> @@ -205,7 +207,8 @@ sdc.CoordinatedUserIDT AS coordinateduseridt, sdc.CoordinatedUserNameT AS coordinatedusernamet, sdc.AssessAnnex AS assessannex, sdc.DonateOrgan AS donateorgan sdc.DonateOrgan AS donateorgan, sdc.complete_state as completeState FROM service_donatebaseinfo sd LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
