From 0afd6c073589d5221774dab5cf4a9d21415ec0e8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 18:00:44 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 4 +---
inspection-server/src/main/resources/mapper/PlanMapper.xml | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 6 ++----
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java | 12 ++++++++++++
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 7c7e66e..3c3edc2 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,8 +1,6 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
-import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -13,6 +11,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
import javax.annotation.Resource;
/**
@@ -42,7 +41,6 @@
@GetMapping("/selectAllPlan")
@AuthHandler
public Result selectAllPlan(String code, String beginTime, String endTime, Integer status) {
- System.out.println(planService.selectAllPlan(code, beginTime, endTime, status).toString());
return Result.success(planService.selectAllPlan(code, beginTime, endTime, status));
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
index f7f01bb..d928e72 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
@@ -58,6 +58,12 @@
private String instrumentName;
/**
+ * 璁惧id
+ **/
+ @JsonSerialize
+ private Integer instrumentId;
+
+ /**
* 鍏宠仈 鐢宠鍗昳d
**/
@JsonSerialize
@@ -68,4 +74,10 @@
**/
@JsonSerialize
private String userName;
+
+ /**
+ * 璐ｄ换浜篿d
+ **/
+ @JsonSerialize
+ private Integer userId;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index f90a852..0e54519 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -254,13 +254,11 @@
BeanUtils.copyProperties(insProduct, insProductVo);
//鑾峰彇璁惧鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
if (insProduct.getInstrumentId() != null) {
- String equipmentName = instrumentService.getById(insProduct.getInstrumentId()).getEquipmentName();
- insProductVo.setInstrumentName(equipmentName);
+ insProductVo.setInstrumentId(insProduct.getInstrumentId());
}
//鑾峰彇鐢ㄦ埛鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
if (insProduct.getUserProId() != null) {
- String userName = userMapper.selectById(insProduct.getUserProId()).getName();
- insProductVo.setUserName(userName);
+ insProductVo.setUserId(insProduct.getUserProId());
}
//椤圭洰鍏宠仈鐗╂枡id
insProductVo.setInspectionMaterialId(inspectionMaterial.getId());
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index d466f4e..cd55aa7 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -5,7 +5,7 @@
<id property="code" column="code"/>
<result property="id" column="id"/>
<result property="samplename" column="samplename"/>
- <result property="inspectionStatus" column="inspectionStatus"/>
+ <result property="testState" column="inspectionStatus"/>
<result property="startTime" column="startTime"/>
<result property="endTime" column="endTime"/>
<collection property="children" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
--
Gitblit v1.9.3