From 332c558607facc3ab043a5554cade68d4f10e139 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Wed, 21 Sep 2022 19:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E6=A3=80?= =?UTF-8?q?=E5=AE=9A=E5=92=8C=E5=85=AC=E5=BC=8F=E7=9A=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/entity/EquipVerification.java | 3 +- .../file/entity/EquipVerificationLog.java | 16 ++-- .../org/springblade/lims/entry/Reagent.java | 2 + .../EquipVerificationController.java | 80 +++++++++++-------- .../EquipVerificationLogController.java | 1 + .../mapper/EquipVerificationLogMapper.xml | 14 ++-- .../file/mapper/EquipVerificationMapper.java | 1 + .../file/mapper/EquipVerificationMapper.xml | 1 + .../service/IEquipVerificationLogService.java | 1 + .../service/IEquipVerificationService.java | 4 + .../impl/EquipVerificationLogServiceImpl.java | 42 ++++++++++ .../impl/EquipVerificationServiceImpl.java | 44 ++++++++++ 12 files changed, 158 insertions(+), 51 deletions(-) diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java index 0a942e0..ede60f8 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java @@ -93,5 +93,6 @@ public class EquipVerification extends BaseEntity { // // @ApiModelProperty(value = "检定状态（业务字典 equip_verification_status）") // private Integer status; - + @ApiModelProperty(value = "检定提前提示的天数") + private Integer warnBefore; } diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java index 89c4ada..c4c5144 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java @@ -28,7 +28,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; /** - * 仪器检定管理实体类 + * 仪器检定管理记录表 * * @author BladeX * @since 2022-07-22 @@ -73,21 +73,23 @@ public class EquipVerificationLog extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime enableTime; /** - * 上次检定时间 + * 检定时间 */ - @ApiModelProperty(value = "上次检定时间") + @ApiModelProperty(value = "检定时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime lastVerificationTime; + private LocalDateTime verification_time; /** * 检定周期（天） */ @ApiModelProperty(value = "检定周期（天）（业务字典 equip_verification_cycle）") private Integer cycle; /** - * 检定次数 + * 检定人 */ - @ApiModelProperty(value = "检定次数") - private Integer total; + @ApiModelProperty(value = "检定人") + private long verificationUser; + @ApiModelProperty(value = "检定轮数") + private Integer cicleNum; } diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java index 6af6a07..9fb07e6 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Reagent.java @@ -66,5 +66,7 @@ public class Reagent extends BaseEntity implements Serializable { @TableField(exist = false) private List operationList; + + private long fomulaId; } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java index 71d7a93..1ac9c06 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java @@ -19,6 +19,7 @@ package org.springblade.file.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -28,6 +29,8 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.file.entity.EquipVerification; +import org.springblade.file.entity.EquipVerificationLog; +import org.springblade.file.service.IEquipVerificationLogService; import org.springblade.file.service.IEquipVerificationService; import org.springblade.file.vo.EquipVerificationVO; import org.springblade.file.wrapper.EquipVerificationWrapper; @@ -35,6 +38,7 @@ import org.springblade.lims.feign.ILimsClient; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * 仪器检定管理 控制器 @@ -48,6 +52,7 @@ import javax.validation.Valid; public class EquipVerificationController extends BladeController { private final IEquipVerificationService equipVerificationService; + private final IEquipVerificationLogService equipVerificationLogService; private final ILimsClient limsClient; @@ -70,6 +75,7 @@ public class EquipVerificationController extends BladeController { @ApiOperation(value = "分页", notes = "传入equipVerification") public R> list(EquipVerification equipVerification, Query query) { IPage pages = equipVerificationService.page(Condition.getPage(query), Condition.getQueryWrapper(equipVerification)); + return R.data(EquipVerificationWrapper.build().pageVO(pages)); } @@ -82,50 +88,56 @@ public class EquipVerificationController extends BladeController { @ApiOperation(value = "分页", notes = "传入equipVerification") public R> page(EquipVerificationVO equipVerification, Query query) { IPage pages = equipVerificationService.selectEquipVerificationPage(Condition.getPage(query), equipVerification); + //获取分页中的具体数据 + List records = pages.getRecords(); + //通过计算确定分页中每件设备是否该检定 + equipVerificationService.setVerificationState(records); + pages.setRecords(records); return R.data(pages); } -// /** -// * 新增 仪器检定管理 -// */ -// @PostMapping("/save") -// @ApiOperationSupport(order = 4) -// @ApiOperation(value = "新增", notes = "传入equipVerification") -// public R save(@Valid @RequestBody EquipVerification equipVerification) { -// return R.status(equipVerificationService.save(equipVerification)); -// } -// -// /** -// * 修改 仪器检定管理 -// */ -// @PostMapping("/update") -// @ApiOperationSupport(order = 5) -// @ApiOperation(value = "修改", notes = "传入equipVerification") -// public R update(@Valid @RequestBody EquipVerification equipVerification) { -// return R.status(equipVerificationService.updateById(equipVerification)); -// } - /** - * 新增或修改 仪器检定管理 + * 新增检定记录 + * @param e (updateVerification) + * @return */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入equipVerification") - public R submit(@Valid @RequestBody EquipVerification equipVerification) { - limsClient.updateStatus(equipVerification.getInstrumentId()); - return R.status(equipVerificationService.saveOrUpdate(equipVerification)); - } + @PostMapping("verification") + @ApiOperation(value="保存检定记录") + public R verification(@RequestBody EquipVerification e){ + equipVerificationLogService.insertLog(e); + return R.success("检定成功"); + } /** - * 删除 仪器检定管理 + * 修改检定记录 + * @param e (EquipVerificationLog) + * @return */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(equipVerificationService.deleteLogic(Func.toLongList(ids))); + @PutMapping("updateVerification") + @ApiOperation(value = "修改检定记录" ) + public R updateVerification(@RequestBody EquipVerificationLog e){ + boolean b = equipVerificationLogService.updateById(e); + if(b){ + return R.data(equipVerificationLogService.getById(e.getId())); + }else{ + return R.fail("修改失败"); + } } + /** + * 新增或修改 仪器检定管理 + */ +// @PostMapping("/submit") +// @ApiOperationSupport(order = 6) +// @ApiOperation(value = "新增或修改", notes = "传入equipVerification") +// public R submit(@Valid @RequestBody EquipVerification equipVerification) { +// limsClient.updateStatus(equipVerification.getInstrumentId()); +// return R.status(equipVerificationService.saveOrUpdate(equipVerification)); +// } + + + + } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java index 05d52b0..9e814ba 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java @@ -53,4 +53,5 @@ public class EquipVerificationLogController extends BladeController { wrapper.orderByDesc(EquipVerificationLog::getCreateTime); return R.data(equipVerificationLogService.page(Condition.getPage(query), wrapper)); } + } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationLogMapper.xml b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationLogMapper.xml index 7d9d201..59d7480 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationLogMapper.xml +++ b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationLogMapper.xml @@ -5,20 +5,16 @@ - - - - - - - + + - - + + + diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.java b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.java index 0332710..3a02257 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.java @@ -43,4 +43,5 @@ public interface EquipVerificationMapper extends BaseMapper { int updateBatchStatus(); + } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml index 8a43959..c580269 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml +++ b/lab-service/lab-file/src/main/java/org/springblade/file/mapper/EquipVerificationMapper.xml @@ -19,6 +19,7 @@ +