From 36488ef509030773381ea67de9d1aa00ce25caf6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 23 八月 2023 16:43:16 +0800
Subject: [PATCH] 8-23 修改3.0
---
chart-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java | 5
chart-server/src/main/java/com/yuanchu/limslaboratory/mapper/WorkMapper.java | 21 +
chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java | 69 ++++
chart-server/src/main/java/com/yuanchu/limslaboratory/service/WorkService.java | 46 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java | 6
pom.xml | 1
/dev/null | 590 ----------------------------------
chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java | 5
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 1
chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/WorkServiceImpl.java | 43 ++
chart-server/src/main/resources/mapper/WorkMapper.xml | 165 +++++++++
chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineSeriesVO.java | 2
sys/pom.xml | 6
chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineChartVO.java | 2
chart-server/pom.xml | 32 +
chart-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java | 0
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java | 6
18 files changed, 405 insertions(+), 597 deletions(-)
diff --git a/chart-server/pom.xml b/chart-server/pom.xml
new file mode 100644
index 0000000..b7f45c1
--- /dev/null
+++ b/chart-server/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>lims-laboratory</artifactId>
+ <groupId>com.yuanchu</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>chart-server</artifactId>
+
+ <properties>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>framework</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.yunchu.limslaboratory</groupId>
+ <artifactId>inspection-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
similarity index 100%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
rename to chart-server/src/main/java/com/yuanchu/limslaboratory/controller/HomeController.java
diff --git a/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java
new file mode 100644
index 0000000..e9daed7
--- /dev/null
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/controller/WorkController.java
@@ -0,0 +1,69 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
+import com.yuanchu.limslaboratory.service.WorkService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = "鏅鸿兘鍥捐〃-->宸ヤ綔缁熻")
+@RestController
+@RequestMapping("/work")
+public class WorkController {
+
+ @Resource
+ WorkService workService;
+
+ @ApiOperation("璐ｄ换浜洪」鐩暟缁熻")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/dutyMater")
+ public Result dutyMater(String startTime,String endTime,Integer type) {
+ return Result.success(workService.dutyMater(startTime,endTime,type));
+ }
+
+
+ @ApiOperation("鎵ц浜洪」鐩暟缁熻")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/executeMater")
+ public Result executeMater(String startTime,String endTime,Integer type) {
+ return Result.success(workService.executeMater(startTime,endTime,type));
+ }
+
+ @ApiOperation("璐ｄ换浜哄強鏃剁巼")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/dutytimely")
+ public Result dutytimely(String startTime,String endTime,Integer type) {
+ return Result.success(workService.dutytimely(startTime,endTime,type));
+ }
+
+ @ApiOperation("鎵ц浜哄強鏃剁巼")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�(0:鍘熸潗鏂�;1:鎴愬搧;2:濮旀墭鍝�)", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/executetimely")
+ public Result executetimely(String startTime,String endTime,Integer type) {
+ return Result.success(workService.executetimely(startTime,endTime,type));
+ }
+}
diff --git a/chart-server/src/main/java/com/yuanchu/limslaboratory/mapper/WorkMapper.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/mapper/WorkMapper.java
new file mode 100644
index 0000000..f841247
--- /dev/null
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/mapper/WorkMapper.java
@@ -0,0 +1,21 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface WorkMapper {
+ //璐ｄ换浜洪」鐩暟缁熻
+ List<Map<String, Object>> dutyMater(String startTime, String endTime, Integer type);
+
+ //鎵ц浜洪」鐩暟缁熻
+ List<Map<String, Object>> executeMater(String startTime, String endTime, Integer type);
+
+ //璐ｄ换浜哄強鏃剁巼
+ List<Map<String, Object>> dutytimely(String startTime, String endTime, Integer type);
+
+ //鎵ц浜哄強鏃剁巼
+ List<Map<String, Object>> executetimely(String startTime, String endTime, Integer type);
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LineChartVO.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineChartVO.java
similarity index 83%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LineChartVO.java
rename to chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineChartVO.java
index 46472e4..c466d0d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LineChartVO.java
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineChartVO.java
@@ -1,4 +1,4 @@
-package com.yuanchu.limslaboratory.pojo.vo;
+package com.yuanchu.limslaboratory.pojo;
import lombok.Data;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LineSeriesVO.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineSeriesVO.java
similarity index 80%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LineSeriesVO.java
rename to chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineSeriesVO.java
index 57e0771..e1dec09 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/LineSeriesVO.java
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/pojo/LineSeriesVO.java
@@ -1,4 +1,4 @@
-package com.yuanchu.limslaboratory.pojo.vo;
+package com.yuanchu.limslaboratory.pojo;
import lombok.Data;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
similarity index 93%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
rename to chart-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
index 4d24674..8511762 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/HomeService.java
@@ -1,6 +1,6 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.vo.LineChartVO;
+import com.yuanchu.limslaboratory.pojo.LineChartVO;
import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.pojo.vo.StatisticsDataVo;
diff --git a/chart-server/src/main/java/com/yuanchu/limslaboratory/service/WorkService.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/WorkService.java
new file mode 100644
index 0000000..14fc7cd
--- /dev/null
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/WorkService.java
@@ -0,0 +1,46 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.LineChartVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WorkService {
+
+ /**
+ * 璐ｄ换浜洪」鐩暟缁熻
+ * @param startTime
+ * @param endTime
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> dutyMater(String startTime, String endTime, Integer type);
+
+ /**
+ * 鎵ц浜洪」鐩暟缁熻
+ * @param startTime
+ * @param endTime
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> executeMater(String startTime, String endTime, Integer type);
+
+ /**
+ * 璐ｄ换浜哄強鏃剁巼
+ * @param startTime
+ * @param endTime
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> dutytimely(String startTime, String endTime, Integer type);
+
+ /**
+ * 鎵ц浜哄強鏃剁巼
+ * @param startTime
+ * @param endTime
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> executetimely(String startTime, String endTime, Integer type);
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
similarity index 98%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
rename to chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
index ef21304..f194143 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/HomeServiceImpl.java
@@ -2,8 +2,8 @@
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
-import com.yuanchu.limslaboratory.pojo.vo.LineChartVO;
-import com.yuanchu.limslaboratory.pojo.vo.LineSeriesVO;
+import com.yuanchu.limslaboratory.pojo.LineChartVO;
+import com.yuanchu.limslaboratory.pojo.LineSeriesVO;
import com.yuanchu.limslaboratory.pojo.vo.ProjectNumVo;
import com.yuanchu.limslaboratory.pojo.vo.StatisticsDataVo;
import com.yuanchu.limslaboratory.service.HomeService;
@@ -17,7 +17,6 @@
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
diff --git a/chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/WorkServiceImpl.java b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/WorkServiceImpl.java
new file mode 100644
index 0000000..4322d41
--- /dev/null
+++ b/chart-server/src/main/java/com/yuanchu/limslaboratory/service/impl/WorkServiceImpl.java
@@ -0,0 +1,43 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.mapper.WorkMapper;
+import com.yuanchu.limslaboratory.pojo.LineChartVO;
+import com.yuanchu.limslaboratory.service.WorkService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class WorkServiceImpl implements WorkService {
+
+ @Resource
+ WorkMapper workMapper;
+
+
+ //璐ｄ换浜洪」鐩暟缁熻
+ @Override
+ public List<Map<String,Object>> dutyMater(String startTime, String endTime, Integer type) {
+ return workMapper.dutyMater(startTime,endTime,type);
+ }
+
+
+ //鎵ц浜洪」鐩暟缁熻
+ @Override
+ public List<Map<String,Object>> executeMater(String startTime, String endTime, Integer type) {
+ return workMapper.executeMater(startTime,endTime,type);
+ }
+
+ //璐ｄ换浜哄強鏃剁巼
+ @Override
+ public List<Map<String, Object>> dutytimely(String startTime, String endTime, Integer type) {
+ return workMapper.dutytimely(startTime,endTime,type);
+ }
+
+ //鎵ц浜哄強鏃剁巼
+ @Override
+ public List<Map<String, Object>> executetimely(String startTime, String endTime, Integer type) {
+ return workMapper.executetimely(startTime,endTime,type);
+ }
+}
diff --git a/chart-server/src/main/resources/mapper/WorkMapper.xml b/chart-server/src/main/resources/mapper/WorkMapper.xml
new file mode 100644
index 0000000..7da6829
--- /dev/null
+++ b/chart-server/src/main/resources/mapper/WorkMapper.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yuanchu.limslaboratory.mapper.WorkMapper">
+ <!--璐ｄ换浜洪」鐩暟缁熻-->
+ <select id="dutyMater" resultType="java.util.Map">
+ select n.name, 鏈畬鎴�, 宸插畬鎴�
+ from (select distinct user.name, count(inspection_product.id) '鏈畬鎴�'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user on inspection_product.user_pro_id = user.id
+ where state = 1
+ and test_state is null
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from lims_laboratory.inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) n,
+ (select distinct user.name, count(inspection_product.id) '宸插畬鎴�'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user on inspection_product.user_pro_id = user.id
+ where state = 1
+ and test_state is not null
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from lims_laboratory.inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) y
+ where n.name = y.name
+ </select>
+
+ <!--鎵ц浜洪」鐩暟缁熻-->
+ <select id="executeMater" resultType="java.util.Map">
+ select n.name, 鏈畬鎴�, 宸插畬鎴�
+ from (select distinct user.name, count(inspection_product.id) '鏈畬鎴�'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user on inspection_product.user_id = user.id
+ where state = 1
+ and test_state is null
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from lims_laboratory.inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) n,
+ (select distinct user.name, count(inspection_product.id) '宸插畬鎴�'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user on inspection_product.user_id = user.id
+ where state = 1
+ and test_state is not null
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from lims_laboratory.inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) y
+ where n.name = y.name
+ </select>
+
+ <!--璐ｄ换浜烘墽琛岀巼-->
+ <select id="dutytimely" resultType="java.util.Map">
+ select n.name, 椤圭洰鎬绘暟, 鍙婃椂瀹屾垚鏁� / 椤圭洰鎬绘暟 * 100 '鍙婃椂鐜�'
+ from (select distinct user.name, count(inspection_product.id) '椤圭洰鎬绘暟'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user on inspection_product.user_pro_id = user.id
+ where state = 1
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from lims_laboratory.inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) n,
+ (select distinct user.name, count(inspection_product.id) '鍙婃椂瀹屾垚鏁�'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user
+ on inspection_product.user_pro_id = user.id
+ left join lims_laboratory.inspection_material im
+ on inspection_product.inspection_material_id = im.id
+ left join lims_laboratory.inspection
+ on im.inspection_id = inspection.id
+ where inspection_product.state = 1
+ and test_state is not null
+ and inspection_product.update_time between start_time and end_time
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) y
+ where n.name = y.name
+ </select>
+
+ <!--鎵ц浜哄強鏃剁巼-->
+ <select id="executetimely" resultType="java.util.Map">
+ select n.name, 椤圭洰鎬绘暟, 鍙婃椂瀹屾垚鏁� / 椤圭洰鎬绘暟 * 100 '鍙婃椂鐜�'
+ from (select distinct user.name, count(inspection_product.id) '椤圭洰鎬绘暟'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user on inspection_product.user_id = user.id
+ where state = 1
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from lims_laboratory.inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) n,
+ (select distinct user.name, count(inspection_product.id) '鍙婃椂瀹屾垚鏁�'
+ from lims_laboratory.inspection_product
+ left join lims_laboratory.user
+ on inspection_product.user_id = user.id
+ left join lims_laboratory.inspection_material im
+ on inspection_product.inspection_material_id = im.id
+ left join lims_laboratory.inspection
+ on im.inspection_id = inspection.id
+ where inspection_product.state = 1
+ and test_state is not null
+ and inspection_product.update_time between start_time and end_time
+ and inspection_product.inspection_material_id in
+ (select id
+ from lims_laboratory.inspection_material
+ where inspection_material.state = 1
+ and inspection_id in
+ (select id
+ from inspection
+ where inspection.state = 1
+ and type = #{type}
+ and start_time between #{startTime} and #{endTime}))
+ group by user.name) y
+ where n.name = y.name
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index 97a838d..f2ccf94 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
diff --git a/pom.xml b/pom.xml
index 2b54948..e7451ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
<module>inspection-server</module>
<module>laboratory-server</module>
<module>cnas-server</module>
+ <module>chart-server</module>
</modules>
<properties>
diff --git a/sql/lims.sql b/sql/lims.sql
deleted file mode 100644
index f2f778f..0000000
--- a/sql/lims.sql
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
-SQLyog Ultimate v13.1.1 (64 bit)
-MySQL - 5.7.32-log : Database - lims_laboratory
-*********************************************************************
-*/
-
-/*!40101 SET NAMES utf8 */;
-
-/*!40101 SET SQL_MODE=''*/;
-
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-CREATE DATABASE /*!32312 IF NOT EXISTS*/`lims_laboratory` /*!40100 DEFAULT CHARACTER SET utf8mb4 */;
-
-USE `lims_laboratory`;
-
-/*Table structure for table `classify` */
-
-DROP TABLE IF EXISTS `classify`;
-
-CREATE TABLE `classify` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '鍒嗙被涓婚敭',
- `father_name` varchar(25) NOT NULL COMMENT '鍒嗙被鐖跺悕绉�',
- `son_name` varchar(25) DEFAULT NULL COMMENT '鍒嗙被瀛愬悕绉�',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `version` int(1) NOT NULL DEFAULT '1' COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `classify` */
-
-insert into `classify`(`id`,`father_name`,`son_name`,`state`,`create_time`,`update_time`,`version`) values
-(1,'娓╁害娴嬮噺浠〃','浣撴俯璁�',1,'2023-07-21 10:42:26','2023-07-21 14:14:54',1),
-(3,'浣撴俯璁�',NULL,1,'2023-07-21 10:48:51','2023-07-21 10:48:51',1),
-(5,'浣撴俯',NULL,1,'2023-07-21 10:53:32','2023-07-21 10:53:32',1),
-(10,'浣撴俯','浣撴俯',0,'2023-07-21 11:16:51','2023-07-21 13:45:52',1),
-(12,'浣撴俯','浣撴俯璁�',1,'2023-07-21 11:16:51','2023-07-21 11:16:51',1),
-(14,'娓╁害娴嬮噺浠〃','浣撴俯鏋�',1,'2023-07-27 09:35:26','2023-07-27 09:35:26',1),
-(15,'娓╁害娴嬮噺浠�1琛�','浣撴俯璁�',1,'2023-08-04 11:29:26','2023-08-04 11:29:26',1);
-
-/*Table structure for table `enterprise` */
-
-DROP TABLE IF EXISTS `enterprise`;
-
-CREATE TABLE `enterprise` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '浼佷笟缂栧彿',
- `name` varchar(20) NOT NULL COMMENT '浼佷笟鍚嶅瓧',
- `byname` varchar(20) NOT NULL COMMENT '浼佷笟绠�绉�',
- `link_name` varchar(10) NOT NULL COMMENT '鑱旂郴浜哄悕瀛�',
- `link_phone` varchar(11) NOT NULL COMMENT '鑱旂郴浜虹數璇�',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `version` int(1) NOT NULL DEFAULT '1' COMMENT '閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `enterprise` */
-
-insert into `enterprise`(`id`,`name`,`byname`,`link_name`,`link_phone`,`create_time`,`update_time`,`version`) values
-(1,'涓ぉ绉戞妧缃戠粶鏈夐檺鍏徃','涓ぉ绉戞妧','鏉庢灄','18400000000','2023-07-07 10:51:38','2023-07-07 10:51:41',1);
-
-/*Table structure for table `equipment_point` */
-
-DROP TABLE IF EXISTS `equipment_point`;
-
-CREATE TABLE `equipment_point` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `instrument_id` int(10) NOT NULL COMMENT '浠櫒Id 鍏宠仈',
- `user_id` int(10) NOT NULL COMMENT '鐢ㄦ埛Id 鍏宠仈',
- `equipment_point` varchar(25) NOT NULL COMMENT '鐮佺偣缂栧彿',
- `equipment_point_name` varchar(25) NOT NULL COMMENT '鐮佺偣鍚嶇О',
- `unit` varchar(20) NOT NULL COMMENT '鍗曚綅',
- `descriptiveness` varchar(100) DEFAULT '--' COMMENT '鎻忚堪',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃ユ湡',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃ユ湡',
- `state` int(11) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `version` int(11) DEFAULT '1' COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `equipment_point` */
-
-insert into `equipment_point`(`id`,`instrument_id`,`user_id`,`equipment_point`,`equipment_point_name`,`unit`,`descriptiveness`,`create_time`,`update_time`,`state`,`version`) values
-(1,1,7,'Area-1','瀵间綋灞忚斀锛堝鍘氶潰绉級','mm','鐤簡锛屽仛涓嶄簡','2023-07-24 14:40:01','2023-07-24 17:23:15',1,1),
-(2,1,7,'Area-2','瀵间綋灞忚斀锛堝鍘氶潰绉級','mm','澶洶浜�','2023-07-24 14:40:01','2023-07-24 15:03:44',1,1),
-(3,1,7,'Area-3','瀵间綋灞忚斀锛堝鍘氶潰绉級','mm','','2023-07-26 13:55:28','2023-07-24 08:00:00',1,1),
-(4,2,7,'Area-6','瀵间綋灞忚斀锛堝鍘氶潰绉級','mm','','2023-07-27 15:06:06','2023-07-24 08:00:00',1,1);
-
-/*Table structure for table `inspection` */
-
-DROP TABLE IF EXISTS `inspection`;
-
-CREATE TABLE `inspection` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '鐢宠鍗曠紪鍙�',
- `code` varchar(25) NOT NULL COMMENT '鐢宠鍗曠紪鐮�',
- `type` int(1) NOT NULL COMMENT '妫�楠岀被鍨� 0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�',
- `inspection_status` int(1) DEFAULT NULL COMMENT '妫�楠岀姸鎬侊細1锛氬悎鏍硷紱0锛氫笉鍚堟牸',
- `start_time` datetime NOT NULL COMMENT '妫�楠屽紑濮嬫棩鏈�',
- `end_time` datetime NOT NULL COMMENT '妫�楠岀粨鏉熸棩鏈�',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL COMMENT '鐧昏鏃ユ湡',
- `update_time` datetime NOT NULL,
- `user_id` int(10) NOT NULL COMMENT '鍏宠仈 鐧昏浜猴紙鐢ㄦ埛id锛�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鐢宠琛�';
-
-/*Data for the table `inspection` */
-
-/*Table structure for table `inspection_material_list` */
-
-DROP TABLE IF EXISTS `inspection_material_list`;
-
-CREATE TABLE `inspection_material_list` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT 'id',
- `material_id` varchar(25) NOT NULL COMMENT '鐗╂枡id',
- `material_num` int(10) NOT NULL COMMENT '鎶ユ鏁伴噺-鐗╂枡鏁伴噺',
- `material_supplier` varchar(25) NOT NULL COMMENT '渚涘簲鍟�',
- `material_name` varchar(25) NOT NULL COMMENT '鐗╂枡鍚嶇О',
- `material_location` varchar(25) NOT NULL COMMENT '鐗╂枡瀛樻斁鍦�',
- `material_batch` varchar(25) NOT NULL COMMENT '鐗╂枡鎵规',
- `material_reel_number` varchar(25) NOT NULL COMMENT '鐗╂枡鐩樺彿',
- `specifications_serial_number` varchar(50) NOT NULL COMMENT '瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О',
- `specifications_voltage_level` varchar(30) DEFAULT NULL COMMENT '鐢靛帇绛夌骇',
- `specifications_cross_section` varchar(30) DEFAULT NULL COMMENT '涓荤嚎蹇冩埅闈�',
- `specifications_number_of_cores` varchar(30) DEFAULT NULL COMMENT '涓荤嚎鑺姱鏁�',
- `specifications_instruct` varchar(30) DEFAULT NULL COMMENT '鐢熶骇鎸囦护鍙�',
- `notes` varchar(100) DEFAULT NULL COMMENT '澶囨敞',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL COMMENT '鎶ユ鏃堕棿',
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT '1',
- `inspection_id` varchar(25) NOT NULL COMMENT '鍏宠仈 鎶ユ鍗昳d',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `inspection_material_list` */
-
-insert into `inspection_material_list`(`id`,`material_id`,`material_num`,`material_supplier`,`material_name`,`material_location`,`material_batch`,`material_reel_number`,`specifications_serial_number`,`specifications_voltage_level`,`specifications_cross_section`,`specifications_number_of_cores`,`specifications_instruct`,`notes`,`state`,`create_time`,`update_time`,`version`,`inspection_id`) values
-(1,'1680929494813868034',100,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','娴嬭瘯瑙勬牸/dsahj1','1','1','1','1',NULL,1,'2023-07-17 21:16:36','2023-07-17 21:16:36',1,'1681215775833042945'),
-(2,'1680929899014750210',100,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','娴嬭瘯瑙勬牸/dsahj1','1','1','1','1',NULL,1,'2023-07-17 21:18:13','2023-07-17 21:18:13',1,'1681215775833042945'),
-(3,'1681499095783407618',100,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','23123','3424','2131','2','123','312',1,'2023-07-19 11:00:00','2023-07-19 11:00:00',1,'1681215775833042945'),
-(4,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','','','瑙勬牸/鍨嬪彿','','','',1,'2023-07-19 13:59:46','2023-07-19 13:59:46',1,'1681215775833042945'),
-(5,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','','','瑙勬牸/鍨嬪彿','','','',1,'2023-07-19 14:00:51','2023-07-19 14:00:51',1,'1681215775833042945'),
-(6,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','','','瑙勬牸/鍨嬪彿','','','',0,'2023-07-19 14:01:46','2023-07-19 14:01:46',1,'1681215775833042945'),
-(7,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','','','瑙勬牸/鍨嬪彿','','','',0,'2023-07-19 14:02:47','2023-07-19 14:02:47',1,'1681215775833042945'),
-(8,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','瑙勬牸/鍨嬪彿','5','2','4','3','1',1,'2023-07-19 14:25:56','2023-07-19 14:39:23',1,'1681215775833042945'),
-(9,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','瑙勬牸/鍨嬪彿','5','2','4','3','1',1,'2023-07-19 15:17:56','2023-07-19 15:17:56',1,'1681215775833042945'),
-(13,'1',10,'涓ぉ','鐢电嚎鐢电紗','鍦颁笅涓�灞�','1','123','瑙勬牸/鍨嬪彿','5','2','4','3','1',0,'2023-07-19 15:44:51','2023-07-20 11:07:27',1,'1681215775833042945');
-
-/*Table structure for table `inspection_product_list` */
-
-DROP TABLE IF EXISTS `inspection_product_list`;
-
-CREATE TABLE `inspection_product_list` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '椤圭洰id',
- `name` varchar(25) NOT NULL COMMENT '椤圭洰鍚嶇О',
- `method` varchar(25) NOT NULL COMMENT '璇曢獙鏂规硶',
- `ask` varchar(30) DEFAULT NULL COMMENT '璇曢獙瑕佹眰',
- `unit` varchar(20) NOT NULL COMMENT '鍗曚綅',
- `required` varchar(20) NOT NULL COMMENT '鎷涙爣浜鸿姹傚��',
- `internal` varchar(20) NOT NULL COMMENT '鍐呮帶鍊�',
- `start_time` datetime DEFAULT NULL COMMENT '寮�濮嬫棩鏈�',
- `end_time` datetime DEFAULT NULL COMMENT '缁撴潫鏃ユ湡',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT '1',
- `inspection_material_list_id` int(10) NOT NULL COMMENT '鍏宠仈 鎶ユ鐗╂枡id',
- `user_id` int(10) NOT NULL COMMENT '鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�',
- `instrument_id` int(10) DEFAULT NULL COMMENT '鍏宠仈 璁惧id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `inspection_product_list` */
-
-insert into `inspection_product_list`(`id`,`name`,`method`,`ask`,`unit`,`required`,`internal`,`start_time`,`end_time`,`state`,`create_time`,`update_time`,`version`,`inspection_material_list_id`,`user_id`,`instrument_id`) values
-(2,'椤圭洰涓�','灏鸿〃娴嬮噺',NULL,'绫�','>=1','>1',NULL,NULL,1,'2023-07-17 21:16:36','2023-07-17 21:16:36',1,1,1,NULL),
-(3,'椤圭洰涓�','灏鸿〃娴嬮噺',NULL,'绫�','>=1','>1',NULL,NULL,1,'2023-07-17 21:18:13','2023-07-17 21:18:13',1,2,1,NULL),
-(4,'椤圭洰浜�','娴嬭瘯鏂规硶',NULL,'浜烘皯甯�','>1','>2',NULL,NULL,1,'2023-07-17 21:18:13','2023-07-17 21:18:13',1,3,1,NULL),
-(5,'椤圭洰涓�','灏鸿〃娴嬮噺',NULL,'绫�','>=1','>1',NULL,NULL,0,'2023-07-19 15:44:51','2023-07-20 11:07:27',1,0,1,NULL),
-(6,'椤圭洰浜�','娴嬭瘯鏂规硶',NULL,'浜烘皯甯�','>1','>2',NULL,NULL,0,'2023-07-19 15:44:51','2023-07-20 11:07:27',1,0,1,NULL);
-
-/*Table structure for table `inspection_records` */
-
-DROP TABLE IF EXISTS `inspection_records`;
-
-CREATE TABLE `inspection_records` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '璁板綍id',
- `method` varchar(25) NOT NULL COMMENT '妫�娴嬫柟娉�',
- `num` int(10) NOT NULL COMMENT '妫�娴嬬殑鏍峰搧鏁伴噺',
- `value` varchar(25) NOT NULL COMMENT '妫�娴嬪��',
- `submit_state` int(1) NOT NULL DEFAULT '0' COMMENT '鎻愪氦鐘舵�� 0锛氬緟鎻愪氦锛�1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL COMMENT '妫�娴嬫棩鏈�',
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT NULL,
- `inspection_product_list_id` int(10) NOT NULL COMMENT '鍏宠仈 鏍峰搧涓嬬殑椤圭洰id',
- `user_name` int(10) DEFAULT NULL COMMENT '鍏宠仈 瀹℃壒浜猴紙鐢ㄦ埛鍚嶇О锛�',
- `approval_time` datetime DEFAULT NULL COMMENT '瀹℃壒鏃ユ湡',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `inspection_records` */
-
-/*Table structure for table `instrument` */
-
-DROP TABLE IF EXISTS `instrument`;
-
-CREATE TABLE `instrument` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `classify_id` int(10) NOT NULL COMMENT '鍒嗙被ID 鍏宠仈',
- `user_id` int(10) NOT NULL COMMENT '鐢ㄦ埛鍏宠仈 淇濈浜�',
- `create_user_id` int(10) NOT NULL COMMENT '鍒涘缓浜�',
- `equipment_code` varchar(25) NOT NULL COMMENT '浠櫒璁惧缂栧彿',
- `equipment_name` varchar(25) NOT NULL COMMENT '浠櫒璁惧鍚嶇О',
- `conditions` int(1) NOT NULL COMMENT '榛樿1锛�1锛氳繍琛屻��2锛氭晠闅溿��3锛氭姤淇��4锛氭淇��5锛氬緟鏈�',
- `specifications_models` varchar(25) NOT NULL COMMENT '瑙勬牸鍨嬪彿',
- `measuring_range` varchar(25) DEFAULT '--' COMMENT '娴嬮噺鑼冨洿',
- `error_rate` varchar(10) DEFAULT '--' COMMENT '璇樊',
- `manufacturer` varchar(50) DEFAULT '--' COMMENT '鐢熶骇鍘傚',
- `arrival_date` datetime DEFAULT NULL COMMENT '鍒拌揣鏃ユ湡',
- `acceptance_date` datetime DEFAULT NULL COMMENT '楠屾敹鏃ユ湡',
- `storage_place` varchar(100) DEFAULT '--' COMMENT '瀛樻斁鍦�',
- `whether_data_acquisition` int(1) NOT NULL COMMENT '鏄惁鏀寔鏁伴噰',
- `equipment_measurement` int(1) NOT NULL COMMENT '鏄惁闇�瑕佷华鍣ㄨ澶囪閲忥細濡傛灉闇�瑕佽閲忓懆鏈熷繀濉紱濡傛灉涓嶉渶瑕佽閲忓懆鏈熶笉蹇呭～',
- `term_validity` int(11) DEFAULT NULL COMMENT '璁￠噺鎴鏈夋晥鏈�',
- `descriptiveness` varchar(100) DEFAULT '--' COMMENT '鎻忚堪',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `version` int(1) DEFAULT '1' COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `instrument` */
-
-insert into `instrument`(`id`,`classify_id`,`user_id`,`create_user_id`,`equipment_code`,`equipment_name`,`conditions`,`specifications_models`,`measuring_range`,`error_rate`,`manufacturer`,`arrival_date`,`acceptance_date`,`storage_place`,`whether_data_acquisition`,`equipment_measurement`,`term_validity`,`descriptiveness`,`create_time`,`update_time`,`state`,`version`) values
-(1,13,9,9,'JSTC-W1-00001','鏁板瓧鐢垫ˉ',1,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-21 15:15:23','2023-07-28 11:37:02',0,1),
-(2,1,9,9,'JSTC-W1-00002','鏁板瓧鐢垫ˉ',1,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-21 15:17:56','2023-07-21 15:58:35',1,1),
-(3,1,10,9,'JSTC-W1-00003','鏁板瓧鐢垫ˉ',3,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2020-01-09 15:18:02','2023-07-21 15:18:02',1,1),
-(4,1,11,9,'JSTC-W1-00004','鏁板瓧鐢垫ˉ',2,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-21 15:18:10','2023-07-21 15:18:10',1,1),
-(5,1,12,11,'JSTC-W1-00005','鏁板瓧鐢垫ˉ',4,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-21 15:18:15','2023-07-21 15:18:15',1,1),
-(6,1,13,11,'JSTC-W1-00006','A鏁板瓧鐢垫ˉ',1,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-21 15:18:19','2023-07-21 15:18:19',1,1),
-(7,1,14,11,'JSTC-W1-00007','鏁板瓧鐢垫ˉ',5,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-21 15:18:23','2023-07-21 15:18:23',1,1),
-(8,1,9,11,'JSTC-W1-00008','鏁板瓧鐢垫ˉ',1,'WCDMS-1','12姣背','0.000001寰背','姹熻嫃榈烽洀','2001-07-06 00:00:00','2060-07-06 00:00:00','鍦扮悆浜氭床涓浗姹熻嫃鍗楅��',1,0,12,'鐤媯鏄熸湡浜旓紒锛侊紒','2023-07-24 14:16:07','2023-07-24 14:16:07',1,1),
-(9,3,7,11,'2','2',2,'2','2','2','2','2023-07-26 00:00:00','2023-07-26 00:00:00','2',1,1,2,'2','2023-07-26 11:26:53','2023-07-26 11:26:53',1,1),
-(10,3,7,11,'3','2',2,'2','2','2','2','2023-07-26 00:00:00','2023-07-26 00:00:00','2',1,0,2,'2','2023-07-26 11:27:05','2023-07-26 11:27:05',1,1);
-
-/*Table structure for table `link_basic_information` */
-
-DROP TABLE IF EXISTS `link_basic_information`;
-
-CREATE TABLE `link_basic_information` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭鑷',
- `entrust_coding` varchar(25) NOT NULL COMMENT '濮旀墭缂栫爜',
- `entrusted` varchar(25) NOT NULL COMMENT '濮旀墭鍗曚綅',
- `contacts` varchar(25) NOT NULL COMMENT '鑱旂郴浜�',
- `contact_number` varchar(16) NOT NULL COMMENT '鑱旂郴鐢佃瘽',
- `contact_address` varchar(50) NOT NULL COMMENT '鑱旂郴鍦板潃',
- `completion_deadline` date NOT NULL COMMENT '瀹屾垚鏈熼檺',
- `inspection_time` date NOT NULL COMMENT '閫佹牱鏃堕棿',
- `sample_delivery_mode` int(1) NOT NULL COMMENT '閫佹牱鏂瑰紡:1閫佹牱;2涓婇棬',
- `sample_sender` varchar(25) DEFAULT NULL COMMENT '閫佹牱浜�',
- `sample_delivery_phone` varchar(16) DEFAULT NULL COMMENT '閫佹牱浜虹數璇�',
- `report_number` int(10) NOT NULL COMMENT '鎶ュ憡鏁�',
- `entrust_remarks` varchar(100) DEFAULT NULL COMMENT '濮旀墭澶囨敞',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `link_basic_information` */
-
-insert into `link_basic_information`(`id`,`entrust_coding`,`entrusted`,`contacts`,`contact_number`,`contact_address`,`completion_deadline`,`inspection_time`,`sample_delivery_mode`,`sample_sender`,`sample_delivery_phone`,`report_number`,`entrust_remarks`,`state`,`create_time`,`update_time`) values
-(2,'SL20230803000003','闃块噷宸村反','灏忛粦','12321423432','姹熻嫃鍗楅��','2023-08-03','2023-08-03',1,'灏忕櫧','123456789676',23,'濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789',1,'2023-08-03 11:45:01','2023-08-03 11:45:01'),
-(3,'SL20230803000003','闃块噷宸村反','灏忛粦','12321423432','姹熻嫃鍗楅��','2023-08-03','2023-08-03',1,'灏忕櫧','123456789676',23,'濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789',1,'2023-08-03 11:45:01','2023-08-03 11:45:01'),
-(4,'SL20230803000003','闃块噷宸村反','灏忛粦','12321423432','姹熻嫃鍗楅��','2023-08-03','2023-08-03',1,'灏忕櫧','123456789676',23,'濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789',1,'2023-08-03 11:45:01','2023-08-03 11:45:01'),
-(5,'SL20230803000003','闃块噷宸村反','灏忛粦','12321423432','姹熻嫃鍗楅��','2023-08-03','2023-08-03',1,'灏忕櫧','123456789676',23,'濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789',1,'2023-08-03 11:45:01','2023-08-03 11:45:01');
-
-/*Table structure for table `link_detection` */
-
-DROP TABLE IF EXISTS `link_detection`;
-
-CREATE TABLE `link_detection` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `sample_number` varchar(16) NOT NULL COMMENT '鏍峰搧缂栧彿',
- `sample_name` varchar(25) NOT NULL COMMENT '鏍峰搧鍚嶇О',
- `specifications_models` varchar(25) NOT NULL COMMENT '瑙勬牸鍨嬪彿',
- `unit` varchar(10) NOT NULL COMMENT '鍗曚綅',
- `samples_number` int(10) NOT NULL COMMENT '鏍峰搧鏁伴噺',
- `experiment` varchar(50) NOT NULL COMMENT '璇曢獙',
- `remarks` varchar(100) NOT NULL COMMENT '澶囨敞',
- `link_basic_id` int(10) NOT NULL COMMENT 'link_basic_information 鍏宠仈Id',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `date_survey` date DEFAULT NULL COMMENT '妫�楠屾棩鏈�',
- `inspection_status` int(1) NOT NULL DEFAULT '2' COMMENT '妫�楠岀姸鎬� 1:宸叉娴� 2:寰呮娴�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `link_detection` */
-
-insert into `link_detection`(`id`,`sample_number`,`sample_name`,`specifications_models`,`unit`,`samples_number`,`experiment`,`remarks`,`link_basic_id`,`state`,`create_time`,`update_time`,`date_survey`,`inspection_status`) values
-(1,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(2,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(3,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(4,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(5,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(6,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(7,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(8,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(9,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(10,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(11,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(12,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1),
-(13,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(14,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',2),
-(15,'YPBH123456789','鍙戝姩鏈�','GGXH-AAAAA','鐧惧害',0,'鍋氭ⅵ','閫氳繃浜�',2,1,'2023-08-03 11:45:01','2023-08-03 11:45:01','2023-08-03',1);
-
-/*Table structure for table `material` */
-
-DROP TABLE IF EXISTS `material`;
-
-CREATE TABLE `material` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '鐗╂枡id',
- `code` varchar(25) NOT NULL COMMENT '鐗╂枡缂栫爜',
- `name` varchar(25) NOT NULL COMMENT '鐗╂枡鍚嶇О',
- `type` int(1) NOT NULL COMMENT '0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT '1',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `material` */
-
-insert into `material`(`id`,`code`,`name`,`type`,`state`,`create_time`,`update_time`,`version`) values
-(1,'wl1','鐢电嚎鐢电紗',0,1,'2023-07-17 14:29:30','2023-07-31 09:58:05',1),
-(2,'wl2','閾濈嚎',1,1,'2023-07-26 16:51:49','2023-07-26 16:51:50',1),
-(3,'BZ1685832056873074690','鐭冲ご',1,1,'2023-07-31 09:57:38','2023-07-31 09:57:38',1);
-
-/*Table structure for table `metering_plan` */
-
-DROP TABLE IF EXISTS `metering_plan`;
-
-CREATE TABLE `metering_plan` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT 'Id涓婚敭',
- `measure_person` int(10) NOT NULL COMMENT '璁￠噺璐熻矗浜� 鍏宠仈鐢ㄦ埛琛�',
- `create_Person` int(10) NOT NULL COMMENT '鍒涘缓浜� 鍏宠仈鐢ㄦ埛琛�',
- `planned_order_number` varchar(25) NOT NULL COMMENT '璁″垝鍗曞彿',
- `begin_time` datetime NOT NULL COMMENT '寮�濮嬫椂闂�',
- `end_time` datetime NOT NULL COMMENT '缁撴潫鏃堕棿',
- `planning_status` int(1) NOT NULL COMMENT '璁″垝鐘舵�侊細涓夌锛�1锛氬凡瀹屾垚锛�2锛氬緟鎻愪氦锛�3锛氭湭瀹屾垚',
- `unit` varchar(10) NOT NULL COMMENT '璁￠噺鍗曚綅',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `version` int(1) DEFAULT '1' COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `metering_plan` */
-
-insert into `metering_plan`(`id`,`measure_person`,`create_Person`,`planned_order_number`,`begin_time`,`end_time`,`planning_status`,`unit`,`create_time`,`update_time`,`state`,`version`) values
-(1,10,21,'P20230728000003','2023-07-06 00:00:00','2023-07-06 00:00:00',1,'GB','2023-07-28 10:07:53','2023-07-28 10:07:53',1,1),
-(2,10,21,'P20230728000004','2023-07-06 00:00:00','2023-07-06 00:00:00',1,'GB','2023-07-28 10:27:30','2023-07-28 10:27:30',1,1);
-
-/*Table structure for table `metrical_information` */
-
-DROP TABLE IF EXISTS `metrical_information`;
-
-CREATE TABLE `metrical_information` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `user_id` int(10) NOT NULL COMMENT '鐢ㄦ埛鍏宠仈Id',
- `instrument_id` int(10) NOT NULL COMMENT '浠櫒Id 鍏宠仈',
- `measurement_unit` varchar(15) NOT NULL COMMENT '璁￠噺鍗曚綅',
- `begin_date` datetime NOT NULL COMMENT '寮�濮嬫棩鏈�',
- `end_date` datetime NOT NULL COMMENT '缁撴潫鏃ユ湡',
- `uncertainty` varchar(20) NOT NULL COMMENT '涓嶇‘瀹氬害',
- `result` int(1) NOT NULL COMMENT '缁撴灉 1锛氬悎鏍硷紱2锛氱煫姝ｅ悗鍙敤锛�3锛氫笉鍚堟牸',
- `performance_index` varchar(100) DEFAULT NULL COMMENT '鎬ц兘鎸囨爣',
- `remarks` varchar(100) DEFAULT NULL COMMENT '澶囨敞',
- `file_path` varchar(50) DEFAULT NULL COMMENT '鏂囦欢璺緞',
- `create_time` datetime NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
- `version` int(1) DEFAULT '1' COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `metrical_information` */
-
-insert into `metrical_information`(`id`,`user_id`,`instrument_id`,`measurement_unit`,`begin_date`,`end_date`,`uncertainty`,`result`,`performance_index`,`remarks`,`file_path`,`create_time`,`update_time`,`state`,`version`) values
-(1,7,1,'1','2023-07-25 00:00:00','2023-07-25 00:00:00','1',1,'1','1','1690255123954_131493.png','2023-07-25 10:43:30','2023-07-25 13:50:24',1,1),
-(2,7,1,'2','2023-07-25 00:00:00','2023-07-25 00:00:00','2',2,'2','2','1690264656523_540845.png','2023-07-25 11:18:44','2023-07-25 13:57:37',1,1),
-(3,7,2,'2','2023-07-25 00:00:00','2023-07-25 00:00:00','2',2,'2','2','1690264656523_540845.png','2023-07-25 11:18:44','2023-07-25 13:57:37',1,1),
-(4,9,2,'1','2023-07-12 00:00:00','2023-08-23 00:00:00','1',2,'2','3','1690358892408_021031.gif','2023-07-26 16:08:12','2023-07-26 16:08:12',1,1);
-
-/*Table structure for table `plan` */
-
-DROP TABLE IF EXISTS `plan`;
-
-CREATE TABLE `plan` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '璁″垝缂栧彿',
- `results` int(10) DEFAULT NULL COMMENT '妫�楠岀粨鏋� 0锛氭湭瀹屾垚锛�1锛氬凡瀹屾垚锛�',
- `thing` varchar(50) DEFAULT NULL COMMENT '璇曢獙璇存槑',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾',
- `create_time` datetime NOT NULL COMMENT '浠诲姟鐧昏鏃堕棿',
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT '1',
- `inspection_id` varchar(25) NOT NULL COMMENT '鍏宠仈 鎶ユid(鐢宠鍗曠紪鍙�)',
- `user_id` int(10) DEFAULT NULL COMMENT '鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)',
- `device_id` int(10) DEFAULT NULL COMMENT '鍏宠仈 璁惧id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `plan` */
-
-/*Table structure for table `product` */
-
-DROP TABLE IF EXISTS `product`;
-
-CREATE TABLE `product` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '椤圭洰id',
- `name` varchar(25) NOT NULL COMMENT '椤圭洰鍚嶇О',
- `father` varchar(20) DEFAULT NULL COMMENT '椤圭洰鐖剁被',
- `unit` varchar(20) NOT NULL COMMENT '鍗曚綅',
- `required` varchar(20) NOT NULL COMMENT '鏍囧噯鍊�',
- `internal` varchar(20) NOT NULL COMMENT '鍐呮帶鍊�',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(1) NOT NULL DEFAULT '1',
- `specifications_id` int(10) NOT NULL COMMENT '鍏宠仈 瑙勬牸id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `product` */
-
-insert into `product`(`id`,`name`,`father`,`unit`,`required`,`internal`,`state`,`create_time`,`update_time`,`version`,`specifications_id`) values
-(1,'椤圭洰涓�','椤圭洰鐖剁被','绫�','>=1','>1',1,'2023-07-17 15:03:17','2023-07-31 09:58:05',1,1),
-(2,'椤圭洰浜�','鐖朵翰','浜烘皯甯�','>1','>2',1,'2023-07-17 21:17:54','2023-07-31 09:58:05',1,1),
-(3,'椤圭洰涓�','鐖朵翰','浜烘皯甯�','>1','>2',1,'2023-07-17 21:17:54','2023-07-31 09:58:05',1,1);
-
-/*Table structure for table `raw_material` */
-
-DROP TABLE IF EXISTS `raw_material`;
-
-CREATE TABLE `raw_material` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '鍘熸潗鏂檌d',
- `supplier_name` varchar(25) NOT NULL COMMENT '渚涘簲鍟嗗悕绉�',
- `material_coding` varchar(25) NOT NULL COMMENT '鏉愭枡缂栫爜',
- `material_name` varchar(25) NOT NULL COMMENT '鏉愭枡鍚嶇О',
- `specifications_models` varchar(25) NOT NULL COMMENT '瑙勬牸鍨嬪彿',
- `unit` varchar(25) NOT NULL COMMENT '鍗曚綅',
- `quantity` int(10) NOT NULL COMMENT '鏁伴噺',
- `inspection_date` datetime NOT NULL COMMENT '鎶ユ鏃ユ湡',
- `surveyor` varchar(25) NOT NULL COMMENT '妫�楠屼汉',
- `date_survey` datetime NOT NULL COMMENT '妫�楠屾棩鏈�',
- `condition` int(1) NOT NULL COMMENT '鐘舵��',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` date NOT NULL COMMENT '鏉ユ枡鏃ユ湡',
- `update_time` date NOT NULL,
- `version` int(1) DEFAULT '1' COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `raw_material` */
-
-insert into `raw_material`(`id`,`supplier_name`,`material_coding`,`material_name`,`specifications_models`,`unit`,`quantity`,`inspection_date`,`surveyor`,`date_survey`,`condition`,`state`,`create_time`,`update_time`,`version`) values
-(1,'test','test','test','test','123',43,'2023-07-31 10:16:50','test','2023-07-31 10:16:54',1,1,'2023-07-31','2023-07-31',1),
-(2,'test','test','test','test','123',43,'2023-07-31 10:16:50','test','2023-07-31 10:16:54',1,1,'2023-07-31','2023-07-31',1),
-(3,'test','test','test','test','123',43,'2023-07-31 10:16:50','test','2023-07-31 10:16:54',1,1,'2023-07-31','2023-07-31',1);
-
-/*Table structure for table `role` */
-
-DROP TABLE IF EXISTS `role`;
-
-CREATE TABLE `role` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '瑙掕壊id',
- `name` varchar(30) NOT NULL COMMENT '瑙掕壊鍚�',
- `power` int(1) NOT NULL COMMENT '0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(10) NOT NULL COMMENT '涔愯閿�',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `role` */
-
-insert into `role`(`id`,`name`,`power`,`state`,`create_time`,`update_time`,`version`) values
-(1,'鏅�氫汉鍛�',1,1,'2023-07-07 11:30:06','2023-07-07 11:30:11',1);
-
-/*Table structure for table `specifications` */
-
-DROP TABLE IF EXISTS `specifications`;
-
-CREATE TABLE `specifications` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '瑙勬牸id',
- `name` varchar(25) NOT NULL COMMENT '瑙勬牸鍚嶇О',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT '1',
- `standard_id` int(10) NOT NULL COMMENT '鍏宠仈 鏍囧噯id',
- PRIMARY KEY (`id`,`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `specifications` */
-
-insert into `specifications`(`id`,`name`,`state`,`create_time`,`update_time`,`version`,`standard_id`) values
-(1,'瑙勬牸1',1,'2023-07-25 17:21:01','2023-07-31 10:08:16',1,1),
-(2,'瑙勬牸2',1,'2023-07-26 16:36:50','2023-07-31 09:58:05',1,1),
-(3,'AB',1,'2023-07-31 09:57:38','2023-07-31 09:57:38',1,3),
-(4,'AB',1,'2023-07-31 09:58:30','2023-07-31 09:58:30',1,4),
-(5,'AB',1,'2023-07-31 09:58:58','2023-07-31 09:58:58',1,5),
-(6,'AB',1,'2023-07-31 09:59:07','2023-07-31 09:59:07',1,1);
-
-/*Table structure for table `standard` */
-
-DROP TABLE IF EXISTS `standard`;
-
-CREATE TABLE `standard` (
- `id` int(10) NOT NULL AUTO_INCREMENT,
- `name` varchar(25) NOT NULL COMMENT '鏍囧噯鍚嶇О',
- `state` int(1) NOT NULL DEFAULT '1',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(1) DEFAULT '1',
- `material_id` int(10) NOT NULL COMMENT '鍏宠仈 鐗╂枡id',
- PRIMARY KEY (`id`,`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `standard` */
-
-insert into `standard`(`id`,`name`,`state`,`create_time`,`update_time`,`version`,`material_id`) values
-(1,'鏍囧噯1',1,'2023-07-25 17:08:58','2023-07-31 09:58:05',1,1),
-(2,'鏍囧噯2',1,'2023-07-26 22:15:55','2023-07-31 09:58:05',1,1),
-(3,'鍏夌氦',1,'2023-07-31 09:57:38','2023-07-31 09:57:38',1,3),
-(4,'鍏夌氦',1,'2023-07-31 09:58:30','2023-07-31 09:58:30',1,1),
-(5,'鍏夌氦',1,'2023-07-31 09:58:58','2023-07-31 09:58:58',1,1);
-
-/*Table structure for table `user` */
-
-DROP TABLE IF EXISTS `user`;
-
-CREATE TABLE `user` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '鐢ㄦ埛id',
- `account` varchar(20) NOT NULL COMMENT '璐﹀彿',
- `password` varchar(100) NOT NULL COMMENT '瀵嗙爜',
- `name` varchar(20) NOT NULL COMMENT '濮撳悕',
- `phone` varchar(11) DEFAULT NULL COMMENT '鎵嬫満鍙�',
- `email` varchar(30) DEFAULT NULL COMMENT '閭',
- `age` int(3) DEFAULT NULL COMMENT '骞撮緞',
- `job_state` int(1) NOT NULL DEFAULT '1' COMMENT '鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0',
- `info` varchar(100) DEFAULT NULL COMMENT '涓�х鍚�',
- `create_time` datetime NOT NULL,
- `update_time` datetime NOT NULL,
- `version` int(1) NOT NULL DEFAULT '1',
- `role_id` int(10) NOT NULL,
- `enterprise_id` int(10) NOT NULL COMMENT '鍏宠仈 浼佷笟ID',
- PRIMARY KEY (`id`),
- UNIQUE KEY `account_unique` (`account`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `user` */
-
-insert into `user`(`id`,`account`,`password`,`name`,`phone`,`email`,`age`,`job_state`,`info`,`create_time`,`update_time`,`version`,`role_id`,`enterprise_id`) values
-(7,'123456','123456','灏忓皬','12345678981','12345678@qq.com',23,1,NULL,'2023-07-11 09:14:50','2023-07-11 09:14:50',1,1,1),
-(9,'1388967','123456','楸奸奔','19727565533','1981343953@qq.com',18,1,NULL,'2023-07-13 14:51:41','2023-07-13 14:51:41',1,1,1),
-(10,'1111111','123456','鍙彯褰�','17726824629','13958368246@gmail.com',13,1,NULL,'2023-07-13 14:57:23','2023-07-13 14:57:23',1,0,1),
-(11,'135686632','123456','鍙彯褰�','13795639054','19813438642@qq.com',18,1,NULL,'2023-07-13 14:58:45','2023-07-13 14:58:45',1,1,1),
-(12,'333','123456','楸奸奔','72398','2144',36,1,NULL,'2023-07-13 15:21:34','2023-07-13 15:21:34',1,0,1),
-(13,'199999','123456','楸奸奔','2154364646','18913908',34,1,NULL,'2023-07-13 15:22:16','2023-07-13 15:22:16',1,1,1),
-(14,'8957824','123456','寮犱笁','23875185298','2222222872',13,1,NULL,'2023-07-13 15:29:13','2023-07-13 15:29:13',1,1,1),
-(21,'45612345','123456','灏忛粦','12345678981','12345678@qq.com',23,1,NULL,'2023-07-17 10:36:23','2023-07-17 10:36:23',1,1,1),
-(23,'4561278345','123456','灏忛粦','12345678981','12345678@qq.com',23,1,NULL,'2023-07-17 11:28:50','2023-07-17 11:28:50',1,1,1);
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
index 6eee650..54c77ae 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductModelController.java
@@ -34,7 +34,11 @@
@Autowired
private ProductModelService productModelService;
-
+ @ApiOperation(value = "閫夋嫨鏍峰搧鍚嶇О")
+ @GetMapping("/selectmater")
+ public Result selectmater() {
+ return Result.success(productModelService.selectmater());
+ }
@ApiOperation(value = "娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍")
@GetMapping("/selectfather")
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java
index f34e701..61eada3 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductModelService.java
@@ -18,6 +18,11 @@
public interface ProductModelService extends IService<ProductModel> {
+ /**
+ * 閫夋嫨鏍峰搧
+ * @return
+ */
+ List<String> selectmater();
/**
* 娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
index 3aca4c6..763408e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
@@ -29,6 +29,12 @@
ProductModelMapper productModelMapper;
+ //閫夋嫨鏍峰搧
+ @Override
+ public List<String> selectmater() {
+ return productModelMapper.selectmater();
+ }
+
//娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
@Override
public List<String> selectfather() {
diff --git a/sys/pom.xml b/sys/pom.xml
index 668acec..a6d901c 100644
--- a/sys/pom.xml
+++ b/sys/pom.xml
@@ -56,6 +56,12 @@
<artifactId>laboratory-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <!--鏅鸿兘鍥捐〃妯″潡-->
+ <dependency>
+ <groupId>com.yuanchu</groupId>
+ <artifactId>chart-server</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
<!--druid-->
<dependency>
--
Gitblit v1.9.3