From 9ddb32175b3624ba3a3cedbfc009d9d526391a20 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 11:54:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-after
---
sql/lims.sql | 376 +++++++++++--------
inspection-server/src/main/resources/mapper/ReportMapper.xml | 55 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 33 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 26 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java | 25 +
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 14
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 2
inspection-server/src/main/resources/mapper/PlanMapper.xml | 42 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java | 33 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java | 36 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 20 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 14
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java | 27 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java | 57 +++
.idea/misc.xml | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java | 60 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java | 37 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 58 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 61 +++
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java | 57 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 49 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 39 ++
.idea/compiler.xml | 1
24 files changed, 969 insertions(+), 160 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3516d6a..87180da 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
+ <profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0abcc97..132404b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,7 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
</project>
\ No newline at end of file
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index d4f20dd..027e223 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.yuanchu.limslaboratory.service.RawMaterialService;
@@ -136,7 +137,6 @@
}
return Result.success(inspectionService.updateInspectsById(id));
}
-
}
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
new file mode 100644
index 0000000..6768f4c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -0,0 +1,49 @@
+package com.yuanchu.limslaboratory.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.yuanchu.limslaboratory.service.PlanService;
+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.format.annotation.DateTimeFormat;
+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;
+import java.util.*;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-09
+ */
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠岃鍒�")
+@RestController
+@RequestMapping("/plan")
+public class PlanController {
+
+ @Resource
+ private PlanService planService;
+
+
+ @ApiOperation("鏌ヨ妫�楠岃鍒�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "deviceId", value = "璁惧鍚嶇ОId", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = Date.class),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = Date.class),
+ @ApiImplicitParam(name = "userId", value = "妫�楠屼汉", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectAllPlan")
+ public Result selectAllPlan(Integer deviceId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, Integer userId) {
+ List<PlanVo> planVoList = planService.selectAllPlan(deviceId, beginTime, endTime, userId);
+ return Result.success(planVoList);
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
new file mode 100644
index 0000000..f8b6e42
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
@@ -0,0 +1,57 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
+import com.yuanchu.limslaboratory.service.ReportAuditingService;
+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;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Api(tags = "妫�楠屾ā鍧�-->鎶ュ憡瀹℃牳")
+@RestController
+@RequestMapping("/reportAuditing")
+public class ReportAuditingController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
+ private ReportAuditingService reportAuditingService;
+
+ @ApiOperation("鏌ヨ鎶ュ憡瀹℃牳鍐呭")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "page", value = "鍒濆椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAllReportAuditing")
+ public Result selectAllReportCheck(Integer page, Integer pageSize, Integer status, String name) {
+ IPage<ReportAuditingVo> reportPage = reportAuditingService.selectAllReportAuditing(new Page<Object>(page, pageSize), status, name);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", reportPage.getTotal());
+ map.put("row", reportPage.getRecords());
+ return Result.success(map);
+ }
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
new file mode 100644
index 0000000..5a3ece9
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -0,0 +1,58 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+import com.yuanchu.limslaboratory.service.ReportService;
+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.beans.factory.annotation.Autowired;
+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;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屾姤鍛�")
+@RestController
+@RequestMapping("/report")
+public class ReportController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
+ private ReportService reportService;
+
+ @ApiOperation("鏌ヨ妫�楠屾姤鍛�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "page", value = "鍒濆椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAllReport")
+ public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name) {
+ IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", reportPage.getTotal());
+ map.put("row", reportPage.getRecords());
+ return Result.success(map);
+ }
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
new file mode 100644
index 0000000..356a29d
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -0,0 +1,14 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+
+import java.util.Date;
+import java.util.List;
+
+public interface PlanMapper {
+ /**
+ * 鏌ヨ妫�楠岃鍒�
+ * @return
+ */
+ List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
new file mode 100644
index 0000000..c5f3504
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
@@ -0,0 +1,33 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+public interface ReportMapper extends BaseMapper<Report> {
+
+
+ /**
+ * 鏌ヨ妫�楠屾姤鍛�
+ * @return
+ */
+ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+
+ /**
+ * 鏌ヨ鎶ュ憡瀹℃牳
+ * @return
+ */
+ IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name);
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
new file mode 100644
index 0000000..0ecf6b6
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
@@ -0,0 +1,57 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Report瀵硅薄", description="")
+@TableName("report")
+public class Report implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鎶ュ憡琛╥d", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
+ private String code;
+
+ @ApiModelProperty(value = "瀹℃壒鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty(value = "瀹℃牳缁撹")
+ private String conclusion;
+
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ private String approver;
+
+ @ApiModelProperty(value = "鍏宠仈 鐢宠琛╥d")
+ private Integer inspectionId;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
new file mode 100644
index 0000000..b876d6a
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
@@ -0,0 +1,60 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 妫�楠岃鍒扸O
+ */
+@Data
+public class PlanVo {
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @JsonSerialize
+ private String device;
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @JsonSerialize
+ private String samplename;
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private String sampleid;
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @JsonSerialize
+ private String modelandspecification;
+ @ApiModelProperty(value = "鍗曚綅")
+ @JsonSerialize
+ private String unit;
+ @ApiModelProperty(value = "鏁伴噺")
+ @JsonSerialize
+ private Integer amount;
+ @ApiModelProperty(value = "妫�楠岄」鐩�")
+ @JsonSerialize
+ private String checkproject;
+ @ApiModelProperty(value = "妫�楠屼汉")
+ @JsonSerialize
+ private String checker;
+ @ApiModelProperty(value = "璁″垝宸ユ湡")
+ @JsonSerialize
+ private Integer duration;
+ @ApiModelProperty(value = "妫�楠岃繘搴�0:鏈垎閰�, 50:妫�楠屼腑, 100:宸插畬鎴�")
+ @JsonSerialize
+ private Integer progress;
+ @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date starttime;
+ @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date finishtime;
+ @ApiModelProperty(value = "璁惧id")
+ @JsonSerialize
+ private Integer deviceId;
+ @ApiModelProperty(value = "妫�楠屼汉id")
+ @JsonSerialize
+ private Integer userId;
+
+ //鍒ゆ柇椤圭洰鐘舵��
+ private Integer state;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
new file mode 100644
index 0000000..7e7ffd1
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
@@ -0,0 +1,36 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎶ュ憡瀹℃牳
+ */
+@Data
+public class ReportAuditingVo {
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private String materialCode;
+ @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
+ @JsonSerialize
+ private String reportCode;
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @JsonSerialize
+ private String materialName;
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟閫氳繃")
+ @JsonSerialize
+ private Integer status;
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ @JsonSerialize
+ private Integer approver;
+ @ApiModelProperty(value = "鎻愪氦鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date submitTime;
+ @ApiModelProperty(value = "瀹℃牳鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date checkTime;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
new file mode 100644
index 0000000..9c7849e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -0,0 +1,33 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 妫�楠屾姤鍛�
+ */
+@Data
+public class ReportVo {
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private String materialCode;
+ @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
+ @JsonSerialize
+ private String reportCode;
+ @ApiModelProperty(value = "鐢宠鍗曞彿")
+ @JsonSerialize
+ private String inspectionCode;
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ @JsonSerialize
+ private Integer approver;
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡瀹℃牳")
+ @JsonSerialize
+ private Integer status;
+ @ApiModelProperty(value = "妫�楠岀粨璁�")
+ @JsonSerialize
+ private String conclusion;
+ @ApiModelProperty(value = "缂栧埗浜�")
+ @JsonSerialize
+ private String name;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
new file mode 100644
index 0000000..205e0c8
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -0,0 +1,26 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-09
+ */
+public interface PlanService {
+ /**
+ * 鏌ヨ妫�楠岃鍒�
+ * @return
+ */
+ List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
new file mode 100644
index 0000000..362ee97
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
@@ -0,0 +1,25 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+public interface ReportAuditingService extends IService<Report> {
+
+ /**
+ * 椤圭洰瀹℃牳琛ㄦ煡璇�
+ * @return
+ */
+ IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name);
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
new file mode 100644
index 0000000..f8a1f21
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
@@ -0,0 +1,27 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+public interface ReportService extends IService<Report> {
+
+
+ /**
+ * 鏌ヨ妫�楠屾姤鍛�
+ *
+ * @return
+ */
+ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+}
+
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 444d70c..03314be 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
@@ -13,6 +13,7 @@
import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -58,6 +59,9 @@
@Resource
UserMapper userMapper;
+
+ @Resource
+ ReportMapper reportMapper;
/**
* 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
@@ -192,6 +196,22 @@
.build();
inspectionMapper.updateById(inspection);
//鐢熸垚鎶ュ憡鍗�
+ Report report = new Report();
+ //鐢熸垚鎶ュ憡鍗曞彿
+ String code = MyUtil.getTimeSixNumberCode("BG");
+ //鑾峰彇妫�楠岀粨璁�
+ String conclusion = "";
+ Inspection inspection1 = inspectionMapper.selectById(id);
+ if (inspection1.getInspectionStatus().equals(1)) {
+ conclusion = "鍚堟牸";
+ }else {
+ conclusion = "涓嶅悎鏍�";
+ }
+ report.setCode(code);
+ report.setStatus(0);
+ report.setConclusion(conclusion);
+ report.setInspectionId(id);
+ reportMapper.insert(report);
return true;
}
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
new file mode 100644
index 0000000..df39e9c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -0,0 +1,61 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.mapper.PlanMapper;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.yuanchu.limslaboratory.service.PlanService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-09
+ */
+@Service
+public class PlanServiceImpl implements PlanService {
+
+ @Resource
+ private PlanMapper planMapper;
+
+ /**
+ * 鏌ヨ妫�楠岃鍒�
+ *
+ * @return
+ */
+ @Override
+ public List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId) {
+ //鑾峰彇鏁版嵁搴撴暟鎹�
+ List<PlanVo> planVos = planMapper.selectAllPlan(deviceId, beginTime, endTime, userId);
+ //娣诲姞璁″垝宸ユ湡鍜屾楠岃繘搴�
+ planVos.forEach(planVo -> {
+ //娣诲姞妫�楠岃繘搴�
+ //鍒ゆ柇鏄惁鏄凡瀹屾垚
+ if (planVo.getState() != null) {
+ planVo.setProgress(100);
+ }
+ //鍒ゆ柇鏄惁鏄湭鍒嗛厤
+ if (planVo.getCheckproject() == null) {
+ planVo.setProgress(0);
+ }
+ //鍒ゆ柇鏄惁鏄繘琛屼腑
+ if (planVo.getState() == null && planVo.getCheckproject() != null) {
+ planVo.setProgress(50);
+ }
+ //娣诲姞璁″垝宸ユ湡
+ if (planVo.getFinishtime() != null && planVo.getStarttime() != null) {
+ long startTimeInMillis = planVo.getStarttime().getTime();
+ long endTimeInMillis = planVo.getFinishtime().getTime();
+ long durationInMillis = endTimeInMillis - startTimeInMillis;
+ long duration = durationInMillis / (1000 * 60 * 60);
+ planVo.setDuration(Integer.valueOf((int) duration));
+ }
+ });
+ return planVos;
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java
new file mode 100644
index 0000000..df8e8e4
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java
@@ -0,0 +1,37 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.ReportMapper;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
+import com.yuanchu.limslaboratory.service.ReportAuditingService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Service
+public class ReportAuditingServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportAuditingService {
+
+ @Resource
+ private ReportMapper reportMapper;
+
+ /**
+ * 椤圭洰瀹℃牳琛ㄦ煡璇�
+ * @return
+ */
+ @Override
+ public IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name) {
+ return reportMapper.selectAllReportAuditing(page, status, name);
+ }
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
new file mode 100644
index 0000000..702f2ae
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -0,0 +1,39 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.ReportMapper;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
+import com.yuanchu.limslaboratory.service.ReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-07
+ */
+@Service
+public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
+
+ @Resource
+ private ReportMapper reportMapper;
+
+ /**
+ * 鏌ヨ妫�楠屾姤鍛�
+ * @return
+ */
+ @Override
+ public IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name) {
+ return reportMapper.selectAllReport(page, status, name);
+ }
+
+}
+
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index d659b1d..ab4c4eb 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -4,7 +4,8 @@
<select id="getLinkBasicPage" resultType="map">
SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`, d.`specifications_models`,
- DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d') inspectionTime, l.`contacts`, d.`date_survey`, d.`inspection_status`
+ DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d') completionDeadline, l.`contacts`,
+ DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`
FROM link_basic_information l, link_detection d
WHERE l.`id` = d.`link_basic_id`
AND l.`state` = 1
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
new file mode 100644
index 0000000..3f04caf
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -0,0 +1,42 @@
+<?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.PlanMapper">
+
+ <!--鏌ヨ妫�楠岃鍒�-->
+ <select id="selectAllPlan" resultType="com.yuanchu.limslaboratory.pojo.vo.PlanVo">
+ select i.equipment_name device,
+ im.name samplename,
+ im.code sampleid,
+ im.specifications modelandspecification,
+ im.unit unit,
+ im.num amount,
+ ip.name checkproject,
+ u.name checker,
+ ip.start_time starttime,
+ ip.end_time finishtime,
+ i.id deviceId,
+ u.id userId,
+ ip.test_state state
+ from instrument i
+ left join (select ip.*
+ from inspection_product ip
+ right join (select instrument_id, max(ip.end_time) t
+ from inspection_product ip
+ group by instrument_id) it
+ on ip.instrument_id = it.instrument_id and ip.end_time = it.t) ip
+ on i.id = ip.instrument_id
+ left join inspection_material im on im.id = ip.inspection_material_id
+ left join user u on u.id = ip.user_id
+ <where>
+ <if test="deviceId != null">
+ and i.id = #{deviceId}
+ </if>
+ <if test="userId != null">
+ and u.id = #{userId}
+ </if>
+ <if test="beginTime != null and endTime != null">
+ and ip.start_time between #{beginTime} and #{endTime}
+ </if>
+ </where>
+ </select>
+</mapper>
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
new file mode 100644
index 0000000..2beac5c
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -0,0 +1,55 @@
+<?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.ReportMapper">
+
+ <!--鏌ヨ妫�楠屾姤鍛�-->
+ <select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">select im.code materialCode,
+ r.code reportCode,
+ i.code inspectionCode,
+ r.approver approver,
+ r.status status,
+ r.conclusion conclusion,
+ u.name name
+ from report r
+ join inspection i on r.inspection_id = i.id
+ join user u on i.user_id = u.id
+ join inspection_material im on i.id = im.inspection_id
+ <where>
+ <if test="status != null">
+ and r.status = #{status}
+ </if>
+ <if test="name != null and name != ''">
+ and im.code like concat('%', #{name}, '%')
+ or i.code like concat('%', #{name}, '%')
+ or r.code like concat('%', #{name}, '%')
+ </if>
+ </where>
+ </select>
+
+ <!--鏌ヨ鎶ュ憡瀹℃牳-->
+ <select id="selectAllReportAuditing" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo">
+ select im.code materialCode,
+ r.code reportCode,
+ im.name materialName,
+ r.status status,
+ r.approver approver,
+ DATE_FORMAT(r.`create_time`, '%Y-%m-%d') submitTime,
+ DATE_FORMAT(r.`check_time`, '%Y-%m-%d') checkTime
+ from report r
+ join inspection i on r.inspection_id = i.id
+ join inspection_material im on i.id = im.inspection_id
+ <where>
+ <if test="status == null">
+ and r.status in (0, 1)
+ </if>
+ <if test="status != null">
+ and r.status = #{status}
+ </if>
+ <if test="name != null and name != ''">
+ and im.code like concat('%', #{name}, '%')
+ or i.code like concat('%', #{name}, '%')
+ or im.name like concat('%', #{name}, '%')
+ </if>
+ </where>
+ </select>
+</mapper>
diff --git a/sql/lims.sql b/sql/lims.sql
index fee83e7..f2f778f 100644
--- a/sql/lims.sql
+++ b/sql/lims.sql
@@ -29,7 +29,7 @@
`update_time` datetime NOT NULL COMMENT '鏇存柊鏃堕棿',
`version` int(1) NOT NULL DEFAULT '1' COMMENT '涔愯閿�',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4;
/*Data for the table `classify` */
@@ -39,7 +39,8 @@
(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),
-(13,'浣撴俯','浣撴俯',1,'2023-07-21 13:50:52','2023-07-21 13:50:52',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` */
@@ -79,40 +80,35 @@
`state` int(11) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎',
`version` int(11) DEFAULT '1' COMMENT '涔愯閿�',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4;
+) 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);
+(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` varchar(25) NOT NULL COMMENT '鎶ユ缂栧彿',
- `type` int(1) NOT NULL COMMENT '0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�',
- `inspection_status` int(1) NOT NULL DEFAULT '0' COMMENT '鎶ユ鐘舵�� 1锛氬凡妫�楠岋紱0鏈楠�',
- `qualified_state` int(1) DEFAULT NULL COMMENT '鏄惁鍚堟牸 1锛氭槸锛�0鍚�',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '1锛氬緟鎻愪氦锛�2锛氬凡鎻愪氦锛�0锛氬凡浣滃簾',
- `create_time` datetime NOT NULL COMMENT '鎶ユ鏃堕棿',
+ `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,
- `version` int(1) DEFAULT '1',
- `user_name` varchar(25) NOT NULL COMMENT '鎶ユ浜�',
- `inspect_user_id` int(10) DEFAULT NULL COMMENT '鍏宠仈 妫�楠屼汉锛堢敤鎴穒d锛�',
- `inspect_start_time` datetime DEFAULT NULL COMMENT '妫�楠屽紑濮嬫棩鏈�',
- `inspect_end_time` datetime DEFAULT NULL COMMENT '妫�楠岀粨鏉熸棩鏈�',
+ `user_id` int(10) NOT NULL COMMENT '鍏宠仈 鐧昏浜猴紙鐢ㄦ埛id锛�',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='鐢宠琛�';
/*Data for the table `inspection` */
-
-insert into `inspection`(`id`,`type`,`inspection_status`,`qualified_state`,`state`,`create_time`,`update_time`,`version`,`user_name`,`inspect_user_id`,`inspect_start_time`,`inspect_end_time`) values
-('1680929494813868034',0,0,NULL,1,'2023-07-17 21:16:36','2023-07-17 21:16:36',1,'娴嬭瘯浜哄憳',NULL,NULL,NULL),
-('1680929899014750210',0,0,NULL,1,'2023-07-17 21:18:13','2023-07-17 21:18:13',1,'娴嬭瘯浜哄憳',NULL,NULL,NULL),
-('1681215775833042945',0,0,NULL,1,'2023-07-18 16:14:11','2023-07-18 16:14:11',1,'娴嬭瘯浜哄憳',NULL,NULL,NULL);
/*Table structure for table `inspection_material_list` */
@@ -218,6 +214,7 @@
`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锛氬緟鏈�',
@@ -230,62 +227,150 @@
`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) 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=9 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4;
/*Data for the table `instrument` */
-insert into `instrument`(`id`,`classify_id`,`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,1,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-24 17:10:17',1,1),
-(2,1,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,'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,'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,'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,'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,'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,'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);
+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` varchar(25) NOT NULL COMMENT '鐗╂枡id',
+ `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '鐗╂枡id',
+ `code` varchar(25) NOT NULL COMMENT '鐗╂枡缂栫爜',
`name` varchar(25) NOT NULL COMMENT '鐗╂枡鍚嶇О',
- `supplier` varchar(25) NOT NULL COMMENT '渚涘簲鍟�',
- `location` varchar(25) NOT NULL COMMENT '鐗╂枡瀛樻斁鍦�',
- `num` int(10) NOT NULL COMMENT '鐗╂枡鏁伴噺',
- `batch` varchar(25) NOT NULL COMMENT '鎵规',
- `reel_number` 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) NOT NULL DEFAULT '1',
- `specifications_id` int(10) NOT NULL COMMENT '鍏宠仈 瑙勬牸id',
+ `version` int(1) DEFAULT '1',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
/*Data for the table `material` */
-insert into `material`(`id`,`name`,`supplier`,`location`,`num`,`batch`,`reel_number`,`state`,`create_time`,`update_time`,`version`,`specifications_id`) values
-('11111111111111','22222222222','1111111111','1111111',1111111,'111111','1111111',0,'2023-07-20 15:19:11','2023-07-21 13:04:12',1,1),
-('112233445566','鎵嬫満','test','test',1,'2','3',1,'2023-07-21 13:29:57','2023-07-21 13:29:57',1,1),
-('11223456','test','鑵捐','浠撳簱涓�锛屼簩鍙锋灦',200,'2','152453211563232',1,'2023-07-21 13:51:21','2023-07-21 13:51:21',1,1),
-('12345','testmaterial','test','test',1,'123','1',0,'2023-07-21 13:08:44','2023-07-21 13:13:54',1,1),
-('123456','test','test','test',1,'1','1',0,'2023-07-21 13:14:49','2023-07-21 13:20:20',1,1),
-('152423211563212','鎵嬫満','鐧惧害','浠撳簱涓�锛屼簩鍙锋灦',200,'1','152453211563212',0,'2023-07-17 14:22:57','2023-07-21 13:28:54',1,1),
-('152453211563211','鐭冲ご','鐧惧害','浠撳簱涓�锛屼笁鍙锋灦',200,'1','152453211563212',0,'2023-07-17 14:14:03','2023-07-21 13:42:15',1,1),
-('152453211563212','鐭冲ご','鐧惧害','浠撳簱涓�锛屼簩鍙锋灦',200,'1','152453211563212',1,'2023-07-21 13:41:49','2023-07-21 13:41:49',1,1),
-('152453211563222','鐭冲ご','鐧惧害','浠撳簱涓�锛屼笁鍙锋灦',200,'1','152453211563212',1,'2023-07-17 14:14:03','2023-07-20 11:09:36',1,4),
-('152453211563233','鐭冲ご','鐧惧害','浠撳簱涓�锛屼笁鍙锋灦',200,'1','152453211563212',1,'2023-07-17 14:14:03','2023-07-20 11:00:29',1,4),
-('218469124614','1122333','test','test',1,'1','1',1,'2023-07-21 13:31:00','2023-07-21 13:31:00',1,1),
-('22222222','2222222','22222222','22222222',22222222,'2222222222','2222222',0,'2023-07-20 15:20:20','2023-07-21 13:21:25',1,1);
+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` */
@@ -294,6 +379,7 @@
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 '缁撴潫鏃ユ湡',
@@ -307,13 +393,15 @@
`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;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4;
/*Data for the table `metrical_information` */
-insert into `metrical_information`(`id`,`user_id`,`measurement_unit`,`begin_date`,`end_date`,`uncertainty`,`result`,`performance_index`,`remarks`,`file_path`,`create_time`,`update_time`,`state`,`version`) values
-(1,7,'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,'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);
+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` */
@@ -340,40 +428,56 @@
DROP TABLE IF EXISTS `product`;
CREATE TABLE `product` (
- `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '娴嬭瘯鏍囧噯id',
- `name` varchar(25) NOT NULL COMMENT '娴嬭瘯鏍囧噯鍚嶇О',
- `method` varchar(25) NOT NULL COMMENT '璇曢獙鏂规硶',
- `father` varchar(20) DEFAULT NULL COMMENT '娴嬭瘯鏍囧噯鐖剁被',
+ `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 '鎷涙爣浜鸿姹傚��',
+ `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',
- `user_id` int(10) NOT NULL COMMENT '鍏宠仈 鐢ㄦ埛id',
- `material_id` varchar(25) NOT NULL COMMENT '鍏宠仈 鐗╂枡id',
+ `specifications_id` int(10) NOT NULL COMMENT '鍏宠仈 瑙勬牸id',
PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
/*Data for the table `product` */
-insert into `product`(`id`,`name`,`method`,`father`,`unit`,`required`,`internal`,`state`,`create_time`,`update_time`,`version`,`user_id`,`material_id`) values
-(1,'鍗曚綅闀垮害璐ㄩ噺','--','閾濆寘閽㈣姱閾濈粸绾�','km','<=0.3458','<=0.3458',0,'2023-07-17 14:56:22','2023-07-21 13:28:54',1,7,'152423211563212'),
-(2,'鍗曚綅瀹藉害璐ㄩ噺','--','閾濆寘閽㈣姱閾濈粸绾�','km','<=0.3458','<=0.3458',1,'2023-07-17 14:56:22','2023-07-20 11:09:36',1,7,'152453211563222'),
-(3,'鍗曚綅瀹藉害璐ㄩ噺','--',NULL,'km','<=0.3458','<=0.3458',1,'2023-07-17 14:56:22','2023-07-20 11:09:36',1,7,'152453211563222'),
-(4,'濂藉1','鎺у埗鍙橀噺娉�','1111111','濂藉1','2000','100',0,'2023-07-20 16:05:38','2023-07-21 13:04:12',1,7,'11111111111111'),
-(5,'濂藉濂藉','---','鏂扮殑鐖堕」鐩�','濂藉濂藉','200','100',0,'2023-07-20 16:10:19','2023-07-21 13:04:12',1,7,'11111111111111'),
-(6,'濂藉濂藉','---','鏂扮殑鐖堕」鐩�','濂藉濂藉','200','100',0,'2023-07-20 16:11:39','2023-07-21 13:04:12',1,7,'11111111111111'),
-(7,'1111111','test',NULL,'test','12','123',1,'2023-07-21 13:31:34','2023-07-21 13:31:34',1,7,'112233445566'),
-(8,'111111','1',NULL,'11','1','1',1,'2023-07-21 13:33:06','2023-07-21 13:33:06',1,7,'112233445566'),
-(9,'鍗曚綅闀垮害璐ㄩ噺','--','閾濆寘閽㈣姱閾濈粸绾�','km','<=0.3458','<=0.3458',1,'2023-07-21 13:39:28','2023-07-21 13:39:28',1,7,'152453211563212'),
-(10,'鍗曚綅闀垮害璐ㄩ噺','--','閾濆寘閽㈣姱閾濈粸绾�','km','<=0.3458','<=0.3458',0,'2023-07-21 13:42:01','2023-07-21 14:19:34',1,7,'152453211563212'),
-(11,'1111111111','1111','閾濆寘閽㈣姱閾濈粸绾�','cm','11','111',0,'2023-07-21 13:48:25','2023-07-21 14:20:50',1,7,'152453211563212'),
-(12,'11111111','1','閾濆寘閽㈣姱閾濈粸绾�','1111','1','1',0,'2023-07-21 13:48:59','2023-07-21 14:19:04',1,7,'112233445566'),
-(13,'11111','--','11111111','km','<=0.3458','<=0.3458',1,'2023-07-21 13:52:21','2023-07-21 13:52:21',1,7,'11223456'),
-(14,'12345','--','11111111','km','<=0.3458','<=0.3458',0,'2023-07-21 13:53:58','2023-07-21 13:56:17',1,7,'11223456'),
-(15,'11111111111111','1','閾濆寘閽㈣姱閾濈粸绾�','111','11','1',0,'2023-07-21 14:23:10','2023-07-21 14:23:22',1,7,'152453211563212');
+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` */
@@ -395,96 +499,54 @@
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 `serial_number` */
-
-DROP TABLE IF EXISTS `serial_number`;
-
-CREATE TABLE `serial_number` (
- `id` varchar(25) NOT NULL COMMENT '鍨嬪彿缂栧彿',
- `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) NOT NULL DEFAULT '1',
- `standards_id` varchar(15) NOT NULL COMMENT '鍏宠仈瀛楁 鏍囧噯id',
- `user_id` int(10) NOT NULL,
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-/*Data for the table `serial_number` */
-
-insert into `serial_number`(`id`,`name`,`state`,`create_time`,`update_time`,`version`,`standards_id`,`user_id`) values
-('111222','鍨嬪彿1',0,'2023-07-20 15:01:08','2023-07-20 15:20:09',1,'111',7),
-('230711000002','鍏夌氦2.0.1',1,'2023-07-11 22:34:11','2023-07-20 09:28:19',1,'230711000001',7),
-('ModelNumber001','鍏夌氦2.0.1',1,'2023-07-20 10:51:01','2023-07-20 10:51:01',1,'230711000002',7),
-('ModelNumber002','鍏夌氦2.0.2',1,'2023-07-18 13:36:13','2023-07-20 09:28:19',1,'230711000001',7),
-('ModelNumber003','鍏夌氦2.0.3',1,'2023-07-18 13:36:23','2023-07-20 10:54:11',1,'230711000002',7),
-('num1','鍏夌氦2.0.3',1,'2023-07-20 14:18:24','2023-07-20 14:18:24',1,'230711000002',7),
-('num2','鍏夌氦2.0.4',1,'2023-07-20 14:19:34','2023-07-20 14:19:34',1,'230711000002',7),
-('PleasantGoat','1345',1,'2023-07-18 13:46:49','2023-07-20 10:22:42',1,'230711000002',7),
-('spiritless','78915',1,'2023-07-18 13:46:24','2023-07-18 13:46:24',1,'230711000004',7);
-
/*Table structure for table `specifications` */
DROP TABLE IF EXISTS `specifications`;
CREATE TABLE `specifications` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '瑙勬牸id',
- `number` varchar(25) NOT NULL COMMENT '瑙勬牸缂栧彿',
- `name` varchar(25) NOT NULL COMMENT '浜у搧瑙勬牸',
- `instruct` varchar(25) DEFAULT NULL COMMENT '鐢熶骇鎸囦护鍙�',
- `voltage_level` varchar(30) DEFAULT NULL COMMENT '鐢靛帇绛夌骇',
- `cross_section` varchar(30) DEFAULT NULL COMMENT '涓荤嚎蹇冩埅闈�',
- `number_of_cores` varchar(30) DEFAULT NULL COMMENT '涓荤嚎鑺姱鏁�',
- `spe_state` int(1) NOT NULL DEFAULT '-1' COMMENT '瑙勬牸鐘舵�� 0锛氬仠鐢紱1锛氭甯革紱-1锛氳崏绋�',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0',
+ `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 COMMENT '鏇存柊鏃堕棿',
- `version` int(1) NOT NULL DEFAULT '1',
- `vel` varchar(15) NOT NULL DEFAULT 'V1.0' COMMENT '瑙勬牸鐗堟湰',
- `serial_id` varchar(25) NOT NULL COMMENT '鍏宠仈瀛楁 鍨嬪彿id',
- `user_id` int(10) NOT NULL COMMENT '鍏宠仈瀛楁 鐢ㄦ埛id',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4;
+ `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`,`number`,`name`,`instruct`,`voltage_level`,`cross_section`,`number_of_cores`,`spe_state`,`state`,`create_time`,`update_time`,`version`,`vel`,`serial_id`,`user_id`) values
-(1,'111','ab','test','1','test','test',0,1,'2023-07-12 00:00:12','2023-07-21 09:52:22',1,'V1.0','230711000002',7),
-(2,'abc','AB','abc','abc','abc','abc',0,1,'2023-07-12 00:00:12','2023-07-20 16:34:38',1,'V1.0','230711000002',7),
-(4,'abc','AB','abc','abc','abc','abc',1,1,'2023-07-12 00:00:12','2023-07-20 11:00:29',1,'V1.0','ModelNumber003',7),
-(5,'abc','AB','abc','abc','abc','abc',1,1,'2023-07-12 00:00:12','2023-07-20 10:22:42',1,'V1.0','PleasantGoat',7),
-(6,'modelId','AB','test','test','test','test',-1,1,'2023-07-20 13:42:40','2023-07-20 13:42:40',1,'V1.0','230711000002',7),
-(7,'modelID1','test','test','test','test','test',-1,1,'2023-07-20 14:02:26','2023-07-20 14:02:26',1,'V1.0','230711000002',7),
-(8,'modelId2','test11','test','test','test','test',-1,1,'2023-07-20 14:03:54','2023-07-20 14:03:54',1,'V1.0','230711000002',7),
-(9,'111222','鍏夌氦2.0.3','test','test','test','test',-1,1,'2023-07-20 14:55:12','2023-07-20 14:55:12',1,'V1.0','230711000002',7);
+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 `standards` */
+/*Table structure for table `standard` */
-DROP TABLE IF EXISTS `standards`;
+DROP TABLE IF EXISTS `standard`;
-CREATE TABLE `standards` (
- `id` varchar(15) NOT NULL COMMENT '鏍囧噯缂栧彿 yyMMdd000001(000001++)',
+CREATE TABLE `standard` (
+ `id` int(10) NOT NULL AUTO_INCREMENT,
`name` varchar(25) NOT NULL COMMENT '鏍囧噯鍚嶇О',
- `eng_name` varchar(25) NOT NULL COMMENT '鑻辨枃鍚嶇О',
- `type` int(1) NOT NULL COMMENT '0锛氬師鏉愭枡锛�1锛氱數绾跨數缂�',
- `state` int(1) NOT NULL DEFAULT '1' COMMENT '閫昏緫瀛楁 0锛氬垹闄わ紱1锛氭甯�',
- `create_time` datetime NOT NULL COMMENT '鐢熸晥鏃ユ湡',
- `update_time` datetime NOT NULL COMMENT '鏇存柊鏃ユ湡',
- `version` int(1) NOT NULL DEFAULT '1',
- `user_id` int(10) NOT NULL COMMENT '鍏宠仈瀛楁 鏇存柊浜篿d',
- PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ `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 `standards` */
+/*Data for the table `standard` */
-insert into `standards`(`id`,`name`,`eng_name`,`type`,`state`,`create_time`,`update_time`,`version`,`user_id`) values
-('111','123131313','164654565',0,0,'2023-07-20 13:26:55','2023-07-20 15:20:09',1,7),
-('112233445566','楸奸奔','fish',1,0,'2023-07-20 10:54:12','2023-07-20 15:19:41',1,7),
-('230711000001','灏忕櫧','OpticalFibre',1,1,'2023-07-11 21:27:04','2023-07-20 09:28:19',1,6),
-('230711000002','鏉愭枡','OpticalFibrw',1,1,'2023-07-11 21:27:04','2023-07-20 10:22:42',1,6),
-('230711000003','鏄剧ず灞�','Monitor',2,1,'2023-07-18 13:43:52','2023-07-18 13:43:52',1,7),
-('230711000004','灏忛粦','Black',2,1,'2023-07-18 13:44:29','2023-07-18 13:44:29',1,7);
+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` */
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index 9d91f2b..8d48ad9 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -1,9 +1,18 @@
package com.yuanchu.limslaboratory;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+import javax.annotation.Resource;
+import java.util.List;
+
@SpringBootTest
class SysApplicationTests {
+
+ @Resource
+ private PlanService planService;
@Test
void contextLoads() {
@@ -11,6 +20,11 @@
System.out.println("newString === " + newString);
}
+ @Test
+ void TT() {
+ List<PlanVo> planVos = planService.selectAllPlan(null, null, null, null);
+ planVos.forEach(System.out::println);
+ }
}
--
Gitblit v1.9.3