From 060fc21c293f3eabcd544602da305e4e83803b42 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 01 九月 2023 17:07:39 +0800
Subject: [PATCH] 修改报告
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java | 5 ++
inspection-server/src/main/resources/mapper/ReportMapper.xml | 44 ++++++++++++++++------
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 4 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 1
sys/src/main/resources/application-dev.yml | 6 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java | 5 ++
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 4 +-
8 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
index 8523b82..1b3c366 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -143,6 +143,7 @@
inspectionVo.setExperiment(linkDetection.getExperiment());
inspectionVo.setSpecificationId(linkDetection.getSpecificationsModels());
inspectionVo.setUnit(linkDetection.getUnit());
+ inspectionVo.setNotes(linkDetection.getRemarks());
return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index adcb5dd..7bd2bfa 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -4,7 +4,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Results;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java
index 134e029..e170b57 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java
@@ -89,5 +89,10 @@
* 鍏宠仈 鐢宠鍗昳d
**/
private Integer inspectionId;
+
+ /**
+ * 澶囨敞
+ */
+ private String notes;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
index 1e5e1cd..a39d3b9 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
@@ -105,4 +105,9 @@
* 鍨嬪彿id
*/
private String specificationId;
+
+ /**
+ * 澶囨敞
+ */
+ private String notes;
}
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 0e54519..96d46d3 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
@@ -155,6 +155,7 @@
.specifications(inspectionVo.getSpecifications())
.formTime(inspectionVo.getFormTime())
.inspectionId(inspection.getId())
+ .notes(inspectionVo.getNotes())
.build();
inspectionMaterialMapper.insert(inspectionMaterial);
/*鏂板妫�楠岄」鐩〃*/
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index a8421e2..3218545 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -22,8 +22,8 @@
join lims_laboratory.inspection_material im on i.id = im.inspection_id
where i.state=1
<if test="message!=null">
- and i.code like concat('%', #{message}, '%')
- or im.name like concat('%', #{message}, '%')
+ and (i.code like concat('%', #{message}, '%')
+ or im.name like concat('%', #{message}, '%'))
</if>
</select>
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 096359e..7cd6cc6 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -58,18 +58,38 @@
</resultMap>
<select id="getReportContext" resultMap="report">
- SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.num,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
- FROM report r
- LEFT JOIN inspection i
- ON r.inspection_id = i.id
- LEFT JOIN inspection_material im
- ON im.inspection_id = i.id
- LEFT JOIN inspection_product ip
- ON ip.inspection_material_id = im.id
- WHERE ip.state != 0
- and im.state != 0
- and i.state != 0
- and r.`code` = #{code}
+ SELECT
+ r.`code` rcode,
+ date_format( r.create_time, '%Y-%m-%d' ) create_time,
+ date_format( r.check_time, '%Y-%m-%d' ) check_time,
+ i.inspection_status,
+ im.`name`,
+ im.num,
+ im.specifications,
+ im.supplier,
+ im.`code` im_code,
+ i.`code` ins_code,
+ i.type,
+ ip.id,
+ ip.`name` ip_name,
+ im.form_time formTime,
+ ip.unit,
+ ip.required,
+ ip.test_value,
+ ip.test_state,
+ u.`name` ipName,
+ im.notes
+ FROM
+ report r
+ LEFT JOIN inspection i ON r.inspection_id = i.id
+ LEFT JOIN inspection_material im ON im.inspection_id = i.id
+ LEFT JOIN inspection_product ip ON ip.inspection_material_id = im.id
+ LEFT JOIN `user` u on ip.user_id =u.id
+ WHERE
+ ip.state != 0
+ AND im.state != 0
+ AND i.state != 0
+ AND r.`code` = #{code}
</select>
</mapper>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index c1b0e0b..c77aa8e 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -43,8 +43,8 @@
# url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
# username: user
# password: 123456
- url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: root
+ url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ username: user
password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
@@ -69,7 +69,7 @@
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
# host: 192.168.110.209
- host: localhost
+ host: 192.168.110.209
# redis绔彛锛堥粯璁や负6379锛�
port: 6380
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3