eight
2024-09-11 02856700ce4cc57cf9447134a9f0c6860d85b802
拆机功能
已修改5个文件
21 ■■■■■ 文件已修改
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/mysql/jh.sql 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -94,13 +94,11 @@
    @GetMapping("/get-latest-rent")
    @Operation(summary = "获取患者设备的最近租赁情况")
    @Parameter(name = "pat-id", description = "患者编号", required = true, example = "1024")
    @Parameter(name = "dev-id", description = "设备编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getLatestRent(
            @RequestParam("pat-id") String patId, @RequestParam("dev-id") String devId)
    public CommonResult<DevRentRespVO> getLatestRent( @RequestParam("dev-id") String devId )
    {
        DevRentDO devRent = devRentService.getLatestRent(patId, devId);
        DevRentDO devRent = devRentService.getLatestRent( devId );
        return success(BeanUtils.toBean(devRent, DevRentRespVO.class));
    }
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
@@ -34,8 +34,7 @@
                .orderByDesc(DevRentDO::getId));
    }
    @Select("select * from lihu.dev_rent where pat_id=#{patId} and dev_id=#{devId} order by rent_time desc limit 1")
    DevRentDO getLatestRent(@Param("patId") String patId, @Param("devId") String devId);
    @Select("select * from lihu.dev_rent where dev_id=#{devId} order by rent_time desc limit 1")
    DevRentDO getLatestRent( @Param("devId") String devId );
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentService.java
@@ -53,5 +53,5 @@
     */
    PageResult<DevRentDO> getDevRentPage(DevRentPageReqVO pageReqVO);
    DevRentDO getLatestRent(String patId, String devId);
    DevRentDO getLatestRent(String devId);
}
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -75,8 +75,8 @@
    }
    @Override
    public DevRentDO getLatestRent(String patId, String devId) {
        return devRentMapper.getLatestRent(patId, devId);
    public DevRentDO getLatestRent(String devId) {
        return devRentMapper.getLatestRent(devId);
    }
}
sql/mysql/jh.sql
@@ -157,8 +157,8 @@
  `update_time` datetime NOT NULL COMMENT '更新时间',
  `deleted` bit(1) DEFAULT b'0' COMMENT '删除标记',
  PRIMARY KEY (`id`),
  KEY `indx_pat_dev` (`pat_id`,`dev_id`,`rent_time`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='装机拆机表';
  KEY `indx_pat_dev` (`dev_id`,`rent_time`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='装机拆机表';
-- ----------------------------
-- Table structure for job_record