jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentPageReqVO.java
@@ -52,6 +52,9 @@ @Schema(description = "状态") private Integer state; @Schema(description = "已付款") private Integer paid; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentRespVO.java
@@ -60,6 +60,10 @@ @ExcelProperty("状态") private Integer state; @Schema(description = "已付款") @ExcelProperty("已付款") private Integer paid; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/vo/DevRentSaveReqVO.java
@@ -49,4 +49,7 @@ @Schema(description = "状态") private Integer state; @Schema(description = "已付款") private Integer paid; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/jobrecord/vo/JobRecordRespVO.java
@@ -60,4 +60,7 @@ @ExcelProperty("对应租赁编号") private Long rentId; } @Schema(description = "已缴费", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("已缴费") private Integer paid; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devmanage/DeviceDO.java
@@ -53,7 +53,7 @@ /** * 遗失日期 */ @TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDate loseDate; /** jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/devrent/DevRentDO.java
@@ -33,7 +33,7 @@ /** * 设备编号 */ @TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.ALWAYS) private String devId; /** * 患者编号 @@ -76,4 +76,6 @@ * @see DevRentStateEnum */ private Integer state; private Integer paid; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/jobrecord/JobRecordDO.java
@@ -43,7 +43,7 @@ /** * 设备编号 */ @TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.ALWAYS) private String devId; /** * 患者编号 @@ -71,4 +71,6 @@ */ private Long rentId; @TableField(exist = false) private Integer paid; } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/devrent/DevRentMapper.java
@@ -6,6 +6,7 @@ import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX; import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO; import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO; import org.apache.ibatis.annotations.Mapper; import cn.lihu.jh.module.ecg.controller.admin.devrent.vo.*; import org.apache.ibatis.annotations.Param; @@ -38,4 +39,15 @@ @Select("select * from lihu.dev_rent where state=#{state} and pat_id=#{patId}") List<DevRentDO> selectByPatIdAndState(@Param("patId") String patId, @Param("state") Integer state); @Select("<script>" + "SELECT paid FROM lihu.dev_rent " + "where id in (" + " <foreach collection='rentIdList' separator=',' item='rentId'>" + " #{rentId} " + " </foreach> )" + "</script>") List<Integer> getPaidInfo(@Param("rentIdList")List<Long> rentIdList); } jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java
@@ -229,7 +229,7 @@ jobRecordSaveReqVO.setDocName( userNickname ); jobRecordSaveReqVO.setPatId( updateReqVO.getPatId() ); jobRecordSaveReqVO.setPatName( updateReqVO.getPatName() ); jobRecordSaveReqVO.setJobTime( updateReqVO.getReturnTime() ); jobRecordSaveReqVO.setJobTime( updateReqVO.getEntryTime() ); jobRecordSaveReqVO.setJobType( DevRentStateEnum.DATAENTERED.getState() ); jobRecordSaveReqVO.setRemark( updateReqVO.getRemark() ); jobRecordSaveReqVO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() ); @@ -237,11 +237,11 @@ jobRecordMapper.insert(jobRecord); } else { jobRecordDO.setJobType( DevRentStateEnum.DATAENTERED.getState() ); jobRecordDO.setJobTime( updateReqVO.getReturnTime() ); jobRecordDO.setJobTime( updateReqVO.getEntryTime() ); jobRecordDO.setRemark( updateReqVO.getRemark() ); jobRecordDO.setSummary( updateReqVO.getInterference() + " " + updateReqVO.getBaseline() + " " + updateReqVO.getDetachment() ); jobRecordDO.setUpdater( String.valueOf(userId) ); jobRecordDO.setUpdateTime( LocalDateTime.now() ); //jobRecordDO.setUpdateTime( LocalDateTime.now() ); jobRecordMapper.updateById(jobRecordDO); } return updateReqVO.getId(); jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/jobrecord/JobRecordServiceImpl.java
@@ -1,6 +1,8 @@ package cn.lihu.jh.module.ecg.service.jobrecord; import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentRespVO; import cn.lihu.jh.module.ecg.dal.dataobject.jobrecord.JobRecordStatisticDO; import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +20,7 @@ import javax.annotation.Resource; import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.lihu.jh.framework.common.pojo.CommonResult.success; import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; /** @@ -31,6 +34,9 @@ @Resource private JobRecordMapper jobRecordMapper; @Resource private DevRentMapper devRentMapper; @Override public Long createJobRecord(JobRecordSaveReqVO createReqVO) { @@ -71,7 +77,17 @@ @Override public PageResult<JobRecordDO> getJobRecordPage(JobRecordPageReqVO pageReqVO) { return jobRecordMapper.selectPage(pageReqVO); PageResult<JobRecordDO> pageResult = jobRecordMapper.selectPage(pageReqVO); List<JobRecordDO> jobRecordDOList = pageResult.getList(); List<Long> rentIdList = jobRecordDOList.stream().map(item -> item.getRentId()).toList(); List<Integer> paidInfoList = devRentMapper.getPaidInfo( rentIdList ); for (int i = 0; i < jobRecordDOList.size(); i++) { jobRecordDOList.get(i).setPaid(paidInfoList.get(i)); } return pageResult; } @Override
