From 262d4d65ad634042c7fcd647ec13385928bc3540 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 14 三月 2024 17:15:46 +0800
Subject: [PATCH] 功能调整
---
/dev/null | 22 --
inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleService.java | 13 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 137 ++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleUserService.java | 13 +
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 18 +
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 43 +++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleUserMapper.java | 18 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 250 +++++++++++-----------
inspect-server/src/main/resources/mapper/InsSampleUserMapper.xml | 20 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleServiceImpl.java | 22 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java | 51 ++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleUserServiceImpl.java | 22 ++
12 files changed, 479 insertions(+), 150 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
new file mode 100644
index 0000000..b524e28
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsSample;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-14 17:14:57
+* @Entity com.yuanchu.mom.pojo.InsSample
+*/
+public interface InsSampleMapper extends BaseMapper<InsSample> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleUserMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleUserMapper.java
new file mode 100644
index 0000000..7649a32
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleUserMapper.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.InsSampleUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample_user(鏍峰搧璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-03-14 17:12:02
+* @Entity com.yuanchu.mom.pojo.InsSampleUser
+*/
+public interface InsSampleUserMapper extends BaseMapper<InsSampleUser> {
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index d14d1fd..44e35bb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -1,167 +1,167 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
-import java.time.LocalDate;
+
import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
/**
- * 妫�楠屼笅鍗�
- *
- * @TableName ins_order
- */
-@TableName(value = "ins_order")
+* 妫�楠屼笅鍗�
+* @TableName ins_order
+*/
@Data
-public class InsOrder extends OrderBy implements Serializable {
+public class InsOrder implements Serializable {
+
/**
- *
- */
+ *
+ */
+ @NotNull(message="[]涓嶈兘涓虹┖")
+ @ApiModelProperty("")
@TableId(type = IdType.AUTO)
private Integer id;
-
/**
- * 濮旀墭缂栧彿
- */
- @ValueTableShow(1)
- @ApiModelProperty(value = "濮旀墭缂栧彿")
+ * 濮旀墭缂栧彿
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("濮旀墭缂栧彿")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
-
/**
- * 鏍峰搧缂栫爜
- */
- @ValueTableShow(2)
- @ApiModelProperty(value = "鏍峰搧缂栫爜")
+ * 鏍峰搧缂栫爜
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鏍峰搧缂栫爜")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String sampleCode;
-
/**
- * 鏍峰搧绫诲瀷
- */
- @ValueTableShow(3)
- @ApiModelProperty(value = "鏍峰搧绫诲瀷")
- private String sampleType;
-
- /**
- * 鏍峰搧鍚嶇О
- */
- @ValueTableShow(3)
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
- private String sample;
-
-
- /**
- * 鏍峰搧鏁伴噺
- */
- @ValueTableShow(4)
- @ApiModelProperty(value = "鏍峰搧鏁伴噺")
- private Integer sampleNum;
-
- /**
- * 绱ф�ョ▼搴�
- */
- @ValueTableShow(5)
- @ApiModelProperty(value = "绱ф�ョ▼搴�")
- private Integer type;
-
- /**
- * 绾﹀畾鏃堕棿
- */
- @ValueTableShow(6)
- @ApiModelProperty(value = "绾﹀畾鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate appointed;
-
- /**
- * 妫�娴嬭繘搴�
- */
- @ValueTableShow(7)
- @ApiModelProperty(value = "妫�娴嬭繘搴�")
- private String insProgress;
-
- /**
- * 涓嬪崟瀹㈡埛
- */
- @ValueTableShow(8)
- @ApiModelProperty(value = "涓嬪崟瀹㈡埛")
+ * 涓嬪崟瀹㈡埛
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("涓嬪崟瀹㈡埛")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
-
/**
- * 涓嬪崟鍗曚綅
- */
- @ValueTableShow(9)
- @ApiModelProperty(value = "涓嬪崟鍗曚綅")
+ * 涓嬪崟鍗曚綅
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("涓嬪崟鍗曚綅")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
-
/**
- * 宸ュ巶鍩�
- */
- @ValueTableShow(10)
- @ApiModelProperty(value = "宸ュ巶鍩�")
+ * 宸ュ巶鍩�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("宸ュ巶鍩�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String code;
-
/**
- * 瀹為獙瀹ゅ悕绉�
- */
- @ValueTableShow(11)
- @ApiModelProperty(value = "瀹為獙瀹ゅ悕绉�")
+ * 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
+ */
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
+ private Integer type;
+ /**
+ * 绾﹀畾鏃堕棿
+ */
+ @ApiModelProperty("绾﹀畾鏃堕棿")
+ private Date appointed;
+ /**
+ * 瀹為獙瀹ゅ悕绉�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("瀹為獙瀹ゅ悕绉�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String laboratory;
-
/**
- * 瑙勬牸鍨嬪彿
- */
- @ValueTableShow(12)
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ * 鏍峰搧绫诲瀷
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鏍峰搧绫诲瀷")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String sampleType;
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String model;
-
/**
- * 鏄惁鐣欐牱
- */
- @ValueTableShow(13)
- @ApiModelProperty(value = "鏄惁鐣欐牱")
+ * 鏍峰搧鍚嶇О
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String sample;
+ /**
+ * 鏍峰搧鏁伴噺
+ */
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Double sampleNum;
+ /**
+ * 鏄惁鐣欐牱
+ */
+ @ApiModelProperty("鏄惁鐣欐牱")
private Integer isLeave;
-
/**
- * 鐣欐牱鏁伴噺
- */
- @ValueTableShow(14)
- @ApiModelProperty(value = "鐣欐牱鏁伴噺")
+ * 鐣欐牱鏁伴噺
+ */
+ @ApiModelProperty("鐣欐牱鏁伴噺")
private Integer leaveNum;
-
/**
- * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
- */
+ * 妫�娴嬭繘搴�
+
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("妫�娴嬭繘搴�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ private String insProgress;
+ /**
+ * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
+ */
+ @ApiModelProperty("1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�")
private Integer state;
-
/**
- * 澶囨敞
- */
+ * 澶囨敞
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("澶囨敞")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String remark;
-
/**
- * OTC璁㈠崟鍙�
- */
+ * OTC璁㈠崟鍙�
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("OTC璁㈠崟鍙�")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String otcCode;
- @ApiModelProperty("鍒涘缓浜�")
+ @ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
/**
*
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
*
*/
- @ApiModelProperty("淇敼浜�")
+ @ApiModelProperty("")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
/**
@@ -171,16 +171,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
-
+ /**
+ * 澶栭敭锛氫笅鍗曞鎴� user琛╥d
+ */
+ @ApiModelProperty("澶栭敭锛氫笅鍗曞鎴� user琛╥d")
private Integer userId;
- @ApiModelProperty(value = "妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)")
- private Integer insState;
-
- @ApiModelProperty(value = "涓嬪彂鏃堕棿")
- private LocalDateTime sendTime;
-
- @ApiModelProperty(value = "宸ュ巶")
- private String factory;
-
-}
\ No newline at end of file
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java
deleted file mode 100644
index 4fdcf42..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderUser.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 妫�楠屽崟璐熻矗浜鸿褰�
- * @TableName ins_order_user
- */
-@TableName(value ="ins_order_user")
-@Data
-public class InsOrderUser implements Serializable {
- /**
- *
- */
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 澶栭敭锛氭楠屽崟id
- */
- private Integer insOrderId;
-
- /**
- * 澶栭敭锛氱敤鎴穒d 璐熻矗浜�
- */
- private Integer userId;
-
- /**
- * 1锛氱‘璁� 0锛氭湭纭
- */
- private Integer state;
-
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
- /**
- *
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
new file mode 100644
index 0000000..b7af605
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -0,0 +1,137 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 妫�楠屾牱鍝�
+ * @TableName ins_sample
+ */
+@TableName(value ="ins_sample")
+@Data
+public class InsSample implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+ */
+ private Integer insResult;
+
+ /**
+ * 澶栭敭锛歩ns_order琛╥d
+ */
+ private Integer insOrderId;
+
+ /**
+ * 閰嶅鏍峰搧鍨嬪彿
+ */
+ private String joinModel;
+
+ /**
+ * 閰嶅鏍峰搧鍚嶇О
+ */
+ private String joinName;
+
+ /**
+ * 鏍峰搧缂栫爜
+ */
+ private String sampleCode;
+
+ /**
+ * 妫�楠屽伐鍘�
+ */
+ private String factory;
+
+ /**
+ * 瀹為獙瀹ゅ悕绉�
+ */
+ private String laboratory;
+
+ /**
+ * 鏍峰搧绫诲瀷
+ */
+ private String sampleType;
+
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ private String sample;
+
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ private String model;
+
+ /**
+ * 鏄惁鐣欐牱 1锛氱暀鏍� 0锛氫笉鐣欐牱
+ */
+ private Integer isLeave;
+
+ /**
+ * 鐣欐牱鏁伴噺
+ */
+ private Integer leaveNum;
+
+ /**
+ * 妫�娴嬭繘搴�
+
+ */
+ private String insProgress;
+
+ /**
+ * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
+ */
+ private Integer insState;
+
+ /**
+ * 涓嬪彂鏃堕棿
+ */
+ private Date sendTime;
+
+ /**
+ * 閰嶅鏍峰搧鏁伴噺
+ */
+ private Integer joinNum;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+ /**
+ * 绾﹀畾鏃堕棿
+ */
+ private Date appointed;
+
+ /**
+ *
+ */
+ private Integer createUser;
+
+ /**
+ *
+ */
+ private Integer updateUser;
+
+ /**
+ *
+ */
+ private Date createTime;
+
+ /**
+ *
+ */
+ private Date updateTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
new file mode 100644
index 0000000..f2321a2
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
@@ -0,0 +1,51 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 鏍峰搧璐熻矗浜鸿褰�
+ * @TableName ins_sample_user
+ */
+@TableName(value ="ins_sample_user")
+@Data
+public class InsSampleUser implements Serializable {
+ /**
+ *
+ */
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 澶栭敭锛氭楠屾牱鍝乮ns_sample琛╥d
+ */
+ private Integer insSampleId;
+
+ /**
+ * 澶栭敭锛氱敤鎴穒d 璐熻矗浜�
+ */
+ private Integer userId;
+
+ /**
+ * 1锛氱‘璁� 0锛氭湭纭
+ */
+ private Integer state;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java
deleted file mode 100644
index b8c024c..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductResultService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.InsProductResult;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_product_result銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-08 09:45:20
-*/
-public interface InsProductResultService extends IService<InsProductResult> {
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
deleted file mode 100644
index b4b75e3..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.InsProduct;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_product(妫�楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-08 09:45:03
-*/
-public interface InsProductService extends IService<InsProduct> {
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleService.java
new file mode 100644
index 0000000..5b1a4fe
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsSample;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-14 17:14:57
+*/
+public interface InsSampleService extends IService<InsSample> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleUserService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleUserService.java
new file mode 100644
index 0000000..564de98
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsSampleUserService.java
@@ -0,0 +1,13 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.InsSampleUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample_user(鏍峰搧璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-03-14 17:12:02
+*/
+public interface InsSampleUserService extends IService<InsSampleUser> {
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java
deleted file mode 100644
index 4b59825..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductResultServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.pojo.InsProductResult;
-import com.yuanchu.mom.service.InsProductResultService;
-import com.yuanchu.mom.mapper.InsProductResultMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_product_result銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-08 09:45:20
-*/
-@Service
-public class InsProductResultServiceImpl extends ServiceImpl<InsProductResultMapper, InsProductResult>
- implements InsProductResultService{
-
-}
-
-
-
-
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
deleted file mode 100644
index e383fa7..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.pojo.InsProduct;
-import com.yuanchu.mom.service.InsProductService;
-import com.yuanchu.mom.mapper.InsProductMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恑ns_product(妫�楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-08 09:45:03
-*/
-@Service
-public class InsProductServiceImpl extends ServiceImpl<InsProductMapper, InsProduct>
- implements InsProductService{
-
-}
-
-
-
-
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleServiceImpl.java
new file mode 100644
index 0000000..2b958ef
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleServiceImpl.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.service.InsSampleService;
+import com.yuanchu.mom.mapper.InsSampleMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-14 17:14:57
+*/
+@Service
+public class InsSampleServiceImpl extends ServiceImpl<InsSampleMapper, InsSample>
+ implements InsSampleService{
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleUserServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleUserServiceImpl.java
new file mode 100644
index 0000000..69cea60
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsSampleUserServiceImpl.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsSampleUser;
+import com.yuanchu.mom.service.InsSampleUserService;
+import com.yuanchu.mom.mapper.InsSampleUserMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恑ns_sample_user(鏍峰搧璐熻矗浜鸿褰�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-03-14 17:12:02
+*/
+@Service
+public class InsSampleUserServiceImpl extends ServiceImpl<InsSampleUserMapper, InsSampleUser>
+ implements InsSampleUserService{
+
+}
+
+
+
+
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
new file mode 100644
index 0000000..7948d72
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -0,0 +1,43 @@
+<?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.mom.mapper.InsSampleMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsSample">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
+ <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
+ <result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
+ <result property="joinName" column="join_name" jdbcType="VARCHAR"/>
+ <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="factory" column="factory" jdbcType="VARCHAR"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
+ <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
+ <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
+ <result property="insState" column="ins_state" jdbcType="INTEGER"/>
+ <result property="sendTime" column="send_time" jdbcType="TIMESTAMP"/>
+ <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,ins_result,ins_order_id,
+ join_model,join_name,sample_code,
+ factory,laboratory,sample_type,
+ sample,model,is_leave,
+ leave_num,ins_progress,ins_state,
+ send_time,join_num,remark,
+ appointed,create_user,update_user,
+ create_time,update_time
+ </sql>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsSampleUserMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleUserMapper.xml
new file mode 100644
index 0000000..faa6b11
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsSampleUserMapper.xml
@@ -0,0 +1,20 @@
+<?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.mom.mapper.InsSampleUserMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsSampleUser">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
+ <result property="userId" column="user_id" jdbcType="INTEGER"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,ins_sample_id,user_id,
+ state,create_user,create_time
+ </sql>
+</mapper>
--
Gitblit v1.9.3