From b92af8a266a150c4acb04a2b941883dd1a15e524 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Tue, 17 Jun 2025 15:46:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/doctornotice/vo/DoctornoticePageReqVO.java | 3 +++ .../admin/doctornotice/vo/DoctornoticeRespVO.java | 4 ++++ .../admin/doctornotice/vo/DoctornoticeSaveReqVO.java | 3 +++ .../system/dal/dataobject/doctornotice/DoctornoticeDO.java | 6 +++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java index 1e229b92f3..e95ef82324 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java @@ -64,4 +64,7 @@ public class DoctornoticePageReqVO extends PageParam { @Schema(description = "是否删除(0:未删除,1:已删除)") private Integer isdeleted; + @Schema(description = "用户姓名") + private String username; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java index 4faf304dca..318111926f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java @@ -76,4 +76,8 @@ public class DoctornoticeRespVO { @ExcelProperty("是否删除(0:未删除,1:已删除)") private Integer isdeleted; + @Schema(description = "用户姓名") + @ExcelProperty("用户姓名") + private String username; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java index 091e6818ca..f9dd8e4cbc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java @@ -68,4 +68,7 @@ public class DoctornoticeSaveReqVO { @Schema(description = "是否删除(0:未删除,1:已删除)") private Integer isdeleted; + @Schema(description = "用户姓名") + private String username; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java index f2f8bafee5..a4e142aa43 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java @@ -104,5 +104,9 @@ public class DoctornoticeDO extends BaseDO { */ @TableField("isdeleted") private Integer isdeleted; - + /** + * 用户姓名 + */ + @TableField("username") + private String username; } \ No newline at end of file From e5c89ab8c0ab2dedabbb94c4b5f7731596a3ef21 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Tue, 17 Jun 2025 16:08:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84ID?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/doctornotice/vo/DoctornoticePageReqVO.java | 3 +++ .../admin/doctornotice/vo/DoctornoticeRespVO.java | 4 ++++ .../admin/doctornotice/vo/DoctornoticeSaveReqVO.java | 3 +++ .../dal/dataobject/doctornotice/DoctornoticeDO.java | 10 +++++++--- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java index e95ef82324..ecc423bf38 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticePageReqVO.java @@ -67,4 +67,7 @@ public class DoctornoticePageReqVO extends PageParam { @Schema(description = "用户姓名") private String username; + @Schema(description = "机构ID") + private Integer orgid; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java index 318111926f..af932795e3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeRespVO.java @@ -80,4 +80,8 @@ public class DoctornoticeRespVO { @ExcelProperty("用户姓名") private String username; + @Schema(description = "机构ID") + @ExcelProperty("机构ID") + private Integer orgid; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java index f9dd8e4cbc..edc00b8ed9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/vo/DoctornoticeSaveReqVO.java @@ -71,4 +71,7 @@ public class DoctornoticeSaveReqVO { @Schema(description = "用户姓名") private String username; + @Schema(description = "机构ID") + private Integer orgid; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java index a4e142aa43..2e75f57a51 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java @@ -17,13 +17,11 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @TableName("tb_doctornotice") @KeySequence("tb_doctornotice_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data -@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class DoctornoticeDO extends BaseDO { - +public class DoctornoticeDO { /** * 主键ID */ @@ -109,4 +107,10 @@ public class DoctornoticeDO extends BaseDO { */ @TableField("username") private String username; + /** + * 机构ID + */ + @TableField("orgid") + private Integer orgid; + } \ No newline at end of file From 03a993f5f8b86552ea33e1112aa49e6167d18237 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Tue, 17 Jun 2025 16:24:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84ID?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dal/mysql/doctornotice/DoctornoticeMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java index a94d93ebb3..20fd1ecb97 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java @@ -34,6 +34,8 @@ public interface DoctornoticeMapper extends BaseMapperX { .eqIfPresent(DoctornoticeDO::getCreateby, reqVO.getCreateby()) .eqIfPresent(DoctornoticeDO::getUpdateby, reqVO.getUpdateby()) .eqIfPresent(DoctornoticeDO::getIsdeleted, reqVO.getIsdeleted()) + .eqIfPresent(DoctornoticeDO::getOrgid, reqVO.getOrgid()) + .eqIfPresent(DoctornoticeDO::getUsername, reqVO.getUsername()) .orderByDesc(DoctornoticeDO::getId)); } From e3da9f0a66e8bb4d9d59b08256086a5a1b6cc45e Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Tue, 17 Jun 2025 17:12:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/doctornotice/DoctornoticeController.java | 10 ++++++++++ .../dal/mysql/doctornotice/DoctornoticeMapper.java | 13 +++++++++++++ .../service/doctornotice/DoctornoticeService.java | 8 ++++++++ .../doctornotice/DoctornoticeServiceImpl.java | 7 +++++++ 4 files changed, 38 insertions(+) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java index 01e780a282..3fc66f6fc6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java @@ -86,4 +86,14 @@ public class DoctornoticeController { BeanUtils.toBean(list, DoctornoticeRespVO.class)); } + @GetMapping("/updateReadStatus") + @Operation(summary = "更新医生通知读取状态") + @Parameter(name = "userid", description = "用户编号", required = true) + @Parameter(name = "readstatus", description = "读取状态", required = true) + public CommonResult updateReadStatus(@RequestParam("userid") Integer userid, + @RequestParam("readstatus") Integer readstatus) { + doctornoticeService.updateReadStatus(userid, readstatus); + return success(true); + } + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java index 20fd1ecb97..c4862d26a9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/doctornotice/DoctornoticeMapper.java @@ -39,4 +39,17 @@ public interface DoctornoticeMapper extends BaseMapperX { .orderByDesc(DoctornoticeDO::getId)); } + /** + * 根据用户ID更新读取状态 + * + * @param userid 用户ID + * @param readstatus 读取状态 + * @return 更新的记录数 + */ + default int updateReadStatusByUserId(Integer userid, Integer readstatus) { + return update(new DoctornoticeDO().setReadstatus(readstatus), + new LambdaQueryWrapperX() + .eq(DoctornoticeDO::getUserid, userid)); + } + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeService.java index 0d67a5b332..2868c35c79 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeService.java @@ -52,4 +52,12 @@ public interface DoctornoticeService { */ PageResult getDoctornoticePage(DoctornoticePageReqVO pageReqVO); + /** + * 更新医生通知读取状态 + * + * @param userid 用户编号 + * @param readstatus 读取状态 + */ + void updateReadStatus(Integer userid, Integer readstatus); + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeServiceImpl.java index b4c7154b2b..0223e51428 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/doctornotice/DoctornoticeServiceImpl.java @@ -71,4 +71,11 @@ public class DoctornoticeServiceImpl implements DoctornoticeService { return doctornoticeMapper.selectPage(pageReqVO); } + @Override + @Transactional(rollbackFor = Exception.class) + public void updateReadStatus(Integer userid, Integer readstatus) { + // 更新该用户所有未读通知的读取状态 + doctornoticeMapper.updateReadStatusByUserId(userid, readstatus); + } + } \ No newline at end of file