job_record 表 增加 rent_id 字段

eight

2024-09-10 c7c191ba74e439057429164fd066b31885778e77

job_record 表 增加 rent_id 字段

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/JobRecordController.java

@@ -92,5 +92,4 @@
                        BeanUtils.toBean(list, JobRecordRespVO.class));
    }

}

}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordPageReqVO.java

@@ -47,4 +47,7 @@
    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
    private LocalDateTime[] createTime;

    @Schema(description = "对应租赁编号", example = "19472")
    private Long rentId;

}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java

@@ -56,4 +56,8 @@
    @ExcelProperty("创建时间")
    private LocalDateTime createTime;

    @Schema(description = "对应租赁编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19472")
    @ExcelProperty("对应租赁编号")
    private Long rentId;

}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordSaveReqVO.java

@@ -2,8 +2,6 @@

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;

import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
@@ -44,4 +42,8 @@
    @Schema(description = "备注", example = "你猜")
    private String remark;

    @Schema(description = "对应租赁编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19472")
    @NotNull(message = "对应租赁编号不能为空")
    private Long rentId;

}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java

@@ -64,5 +64,9 @@
     * 备注
     */
    private String remark;
    /**
     * 对应租赁编号
     */
    private Long rentId;

}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/jobrecord/JobRecordMapper.java

@@ -29,6 +29,7 @@
                .eqIfPresent(JobRecordDO::getSummary, reqVO.getSummary())
                .eqIfPresent(JobRecordDO::getRemark, reqVO.getRemark())
                .betweenIfPresent(JobRecordDO::getCreateTime, reqVO.getCreateTime())
                .eqIfPresent(JobRecordDO::getRentId, reqVO.getRentId())
                .orderByDesc(JobRecordDO::getId));
    }


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordService.java

@@ -53,5 +53,4 @@
     */
    PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO);

}

}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java

@@ -2,10 +2,13 @@

import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.jobrecord.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;

import cn.lihu.jh.module.ecg.dal.mysql.jobrecord.JobRecordMapper;

 sql/mysql/jh.sql

@@ -169,6 +169,7 @@
  `job_type` int NOT NULL COMMENT '作业类型',
  `doc_id` bigint NOT NULL COMMENT '医生编号',
  `doc_name` varchar(45) DEFAULT NULL COMMENT '医生名称',
  `rent_id` bigint NOT NULL COMMENT '对应租赁编号',
  `dev_id` varchar(45) DEFAULT NULL COMMENT '设备编号',
  `pat_id` varchar(45) DEFAULT NULL COMMENT '患者编号',
  `pat_name` varchar(45) DEFAULT NULL COMMENT '患者名称',