学生健康调整

src/main/java/com/xjrsoft/module/personnel/controller/PersonnelHealthyController.java

@@ -52,12 +52,15 @@ public class PersonnelHealthyController {
     @SaCheckPermission("personnelhealthy:detail")
     public RT<PageOutput<PersonnelHealthyPageVo>> page(@Valid PersonnelHealthyPageDto dto){
 
-
+        Long userId = StpUtil.getLoginIdAsLong();
+        if(dto.getUserId() != null){
+            userId = dto.getUserId();
+        }
         LambdaQueryWrapper<PersonnelHealthy> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
                     .orderByDesc(PersonnelHealthy::getId)
                 .eq(StrUtil.isNotEmpty(dto.getType()), PersonnelHealthy::getType, dto.getType())
-                .eq(PersonnelHealthy::getUserId, StpUtil.getLoginIdAsLong())
+                .eq(PersonnelHealthy::getUserId, userId)
                 .select(PersonnelHealthy.class,x -> VoToColumnUtil.fieldsToColumns(PersonnelHealthyPageVo.class).contains(x.getProperty()));
         IPage<PersonnelHealthy> page = personnelHealthyService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<PersonnelHealthyPageVo> pageOutput = ConventPage.getPageOutput(page, PersonnelHealthyPageVo.class);

src/main/java/com/xjrsoft/module/personnel/dto/PersonnelHealthyPageDto.java

@@ -19,4 +19,7 @@ public class PersonnelHealthyPageDto extends PageInput {
     @ApiModelProperty("疾病类别(xjr_dictionary_item[healthy_type])")
     private String type;
 
+    @ApiModelProperty("用户id(xjr_user)")
+    private Long userId;
+
 }

src/main/resources/sqlScript/20240718_sql.sql

@@ -374,3 +374,21 @@ ALTER TABLE `textbook`
   ADD COLUMN `work_total_count` INT NULL   COMMENT '编著作总数' AFTER `plan_batch`;
 
 
+-- --------------------------------------------------------------------------------------------
+-- 人员健康信息表
+-- --------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS personnel_healthy;   
+CREATE TABLE `personnel_healthy` (
+  `id` BIGINT NOT NULL,
+  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
+  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
+  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
+  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
+  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
+  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
+  `user_id` BIGINT DEFAULT NULL COMMENT '疾病名称',
+  `name` VARCHAR(50) DEFAULT NULL COMMENT '疾病名称',
+  `type` VARCHAR(50) DEFAULT NULL COMMENT '疾病类别(xjr_dictionary_item[healthy_type])',
+  `source` VARCHAR(50) DEFAULT NULL COMMENT '病史来源',
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='人员健康信息表';