From 1ff85b6e1210b47d4790f866ba59fd50600b3fb4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 10:49:46 +0800
Subject: [PATCH] 修改代码
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java | 98 ++++++++++++++++++++++++++++++++++++------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 4 ++
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml | 5 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java | 4 +-
5 files changed, 84 insertions(+), 29 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index ddb5675..72938a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -19,6 +19,7 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -46,6 +47,7 @@
* @author ruoyi
* @date 2021-11-15
*/
+@Slf4j
@Api("浜插睘纭绠＄悊")
@RestController
@RequestMapping("/project/relativesconfirmation")
@@ -119,6 +121,7 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
+ log.info("鏂板鎹愮尞浜插睘纭锛歿}", serviceRelativesconfirmation);
boolean save = serviceRelativesconfirmationService.save(serviceRelativesconfirmation);
return AjaxResult.success(serviceRelativesconfirmation);
}
@@ -132,6 +135,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
+ log.info("淇敼浜插睘纭锛歿}", serviceRelativesconfirmation);
if (serviceRelativesconfirmation.getInfoid() == null || serviceRelativesconfirmation.getId() == null) {
throw new BaseException("璇疯仈绯诲伐绋嬪笀妫�鏌D鏄惁涓虹┖");
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
index 27a7947..0b24198 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitnessorgan.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,114 +13,161 @@
/**
* 鎹愮尞鍣ㄥ畼鑾峰彇瀵硅薄 service_donationwitnessorgan
- *
+ *
* @author ruoyi
* @date 2023-12-25
*/
@Data
@ApiModel("鎹愮尞鍣ㄥ畼鑾峰彇")
-public class ServiceDonationwitnessorgan extends BaseEntity
-{
+public class ServiceDonationwitnessorgan extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
@Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
private String organno;
- /** 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
- /** 鍣ㄥ畼缂栧彿 */
+ /**
+ * 鍣ㄥ畼缂栧彿
+ */
@ApiModelProperty("鍣ㄥ畼缂栧彿 ")
@Excel(name = "鍣ㄥ畼缂栧彿 ")
private String organnumber;
- /** 鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢�")
@Excel(name = "鍣ㄥ畼鑾峰彇鐘舵�� 锛�0锛氭湭鑾峰彇锛�1锛氬凡鑾峰彇锛�2锛氬純鐢�")
private String organstate;
- /** 鏈幏鍙栧師鍥� */
+ /**
+ * 鏈幏鍙栧師鍥�
+ */
@ApiModelProperty("鏈幏鍙栧師鍥�")
@Excel(name = "鏈幏鍙栧師鍥�")
private String notgetreason;
- /** 鍣ㄥ畼鑾峰彇鏃堕棿 */
- @ApiModelProperty("鍣ㄥ畼鑾峰彇鏃堕棿")
+ /**
+ * 绂讳綋鏃堕棿
+ */
+ @ApiModelProperty("绂讳綋鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "鍣ㄥ畼鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "绂讳綋鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date organgettime;
- /** 鍖荤敓濮撳悕 */
+ /**
+ * 鎵嬫湳寮�濮嬫椂闂�
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍣ㄥ畼鑾峰彇寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date organStartTime;
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
@ApiModelProperty("鍖荤敓濮撳悕")
@Excel(name = "鍖荤敓濮撳悕")
private String organgetdoct;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String gainhospitalno;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String gainhospitalname;
- /** 鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1 */
+ /**
+ * 鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1
+ */
@ApiModelProperty("鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1")
@Excel(name = "鑾峰彇鍓嶆椿妫�锛屽弬瑙乻ys_0_1")
private String isbiopsybefore;
- /** 鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1 */
+ /**
+ * 鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1
+ */
@ApiModelProperty("鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1")
@Excel(name = "鑾峰彇鍚庢椿妫�锛屽弬瑙乻ys_0_1")
private String isbiopsyafter;
- /** 灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1 */
+ /**
+ * 灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1
+ */
@ApiModelProperty("灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1")
@Excel(name = "灞炰簬杈圭紭鍣ㄥ畼锛屽弬瑙乻ys_0_1")
private String ismarginalorgan;
- /** 鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1 */
+ /**
+ * 鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1
+ */
@ApiModelProperty("鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1")
@Excel(name = "鐥呭師鑿岄槼鎬э紝鍙傝sys_0_1")
private String ispathogenpositive;
- /** 鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1 */
+ /**
+ * 鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1
+ */
@ApiModelProperty("鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1")
@Excel(name = "鍘熷彂鎬ф棤鍔熻兘锛屽弬瑙乻ys_0_1")
private String ispnf;
- /** 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1 */
+ /**
+ * 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1
+ */
@ApiModelProperty("鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
@Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
private String isdgf;
- /** 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1 */
+ /**
+ * 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1
+ */
@ApiModelProperty("鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
@Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
private String name;
- /** 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1 */
+ /**
+ * 鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1
+ */
@ApiModelProperty("鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
@Excel(name = "鍔熻兘寤惰繜鎬ф仮澶嶏紝鍙傝sys_0_1")
private String caseno;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
index c6c9206..445c868 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -181,7 +181,7 @@
/** 绛剧讲鏃ユ湡 */
@ApiModelProperty("绛剧讲鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "绛剧讲鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date signdate;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
index 916311b..11cf8fd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
@@ -85,8 +85,8 @@
private String kinship;
private Long kinship_childrennum;
private String kinshipconfirmationsign;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ // @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signdate;
private Long delFlag;
private String createBy;
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
index 175dc8b..08e72e9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -29,12 +29,14 @@
<result property="updateTime" column="update_time"/>
<result property="name" column="name"/>
<result property="caseno" column="caseno"/>
+ <result property="organStartTime" column="organ_start_time"/>
</resultMap>
<sql id="selectServiceDonationwitnessorganVo">
select ID,
InfoID,
DonorNo,
+ organ_start_time,
OrganNo,
OrganName,
OrganNumber,
@@ -86,7 +88,8 @@
</if>
<if test="ispnf != null and ispnf != ''">and IsPNF = #{ispnf}</if>
<if test="isdgf != null and isdgf != ''">and IsDGF = #{isdgf}</if>
+ <if test="organStartTime != null">and organ_start_time = #{organStartTime}</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3