From a5e88bf7cfb029f597a70b00bca50264125b2503 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期五, 15 三月 2024 18:04:34 +0800
Subject: [PATCH] 检验下单 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/dto/InsOderDto.java | 20 ++
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java | 133 +++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java | 26 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 116 +++--------
inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java | 15 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 6
inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java | 28 ++
inspect-server/src/main/resources/mapper/SampleOrderMapper.xml | 62 ++++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 14
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 3
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 78 +++----
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 22 ++
inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java | 15 +
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 10
15 files changed, 408 insertions(+), 143 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 1449e17..1cc8262 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -1,8 +1,11 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +23,8 @@
public class InsOrderController {
private InsOrderService insOrderService;
+
+ private InsSampleService insSampleService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@@ -47,4 +52,21 @@
public Result<?> upInsOrderParameter(@RequestBody InsOrder itemParameter) {
return Result.success(insOrderService.upInsOrderParameter(itemParameter));
}
+
+ @ApiOperation(value = "淇敼妫�楠屼笅鍙戞暟鎹�")
+ @PostMapping("/updateInsOrder")
+ public Result updateInsOrder(@RequestBody InsOderDto insOderDto) {
+ InsSample insSample = new InsSample();
+ insSample.setId(insOderDto.getId());
+ insSample.setCreateTime(insOderDto.getDate());
+ insSample.setCreateUser(insOderDto.getOrderName());
+ return Result.success(insSampleService.updateById(insSample));
+ }
+
+ @ApiOperation(value = "鏂板妫�楠屼笅鍙戞暟鎹�")
+ @PostMapping("/addInsOrder")
+ public Result addInsOrder(@RequestBody InsSample insSample) {
+ return Result.success(insSampleService.save(insSample));
+ }
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
new file mode 100644
index 0000000..a8be6ca
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.controller;
+
+import com.yuanchu.mom.service.SampleOrderService;
+import com.yuanchu.mom.vo.Result;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 19:10
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sampleOrder")
+public class SampleOrderController {
+
+ private SampleOrderService sampleOrderService;
+
+ @GetMapping("/list")
+ public Result list() {
+ return Result.success(sampleOrderService.selectSampleOrderList());
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOderDto.java
new file mode 100644
index 0000000..4ab9a8c
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOderDto.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 16:44
+ **/
+@Data
+public class InsOderDto {
+
+ private Integer id;
+ private Integer orderName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime date;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java
new file mode 100644
index 0000000..852c00d
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java
@@ -0,0 +1,133 @@
+package com.yuanchu.mom.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yuanchu.mom.pojo.InsOrder;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 18:46
+ **/
+@Data
+public class SampleOrder {
+ @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;
+
+ private List<InsOrder> insOrderList;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index e3d055d..19f7c27 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
@@ -21,14 +22,11 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
IPage<InsOrder> selectInsOrderParameter(IPage<InsOrder> page, QueryWrapper<InsOrder> ew);
- //娣诲姞妫�楠屼笅鍗曟暟鎹�
- int addInsOrderParameter(InsOrder itemParameter);
-
- //鍒犻櫎妫�楠屼笅鍗曟暟鎹�
- int delInsOrderParameter(Integer id);
-
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrderParameter(InsOrder itemParameter);
+
+ //娣诲姞妫�楠屼笅鍗曟暟鎹�
+ int addInsOrder(InsOderDto insOderDto);
}
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
index 997e607..b728934 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -1,11 +1,10 @@
package com.yuanchu.mom.mapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.pojo.InsSample;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.ibatis.annotations.Param;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java
new file mode 100644
index 0000000..14da193
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.mom.dto.SampleOrder;
+
+import java.util.List;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 18:54
+ **/
+public interface SampleOrderMapper extends BaseMapper<SampleOrder> {
+ List<SampleOrder> selectSampleOrderList();
+}
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 44e35bb..d50b2ff 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,180 +1,136 @@
package com.yuanchu.mom.pojo;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-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 com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
/**
* 妫�楠屼笅鍗�
* @TableName ins_order
*/
@Data
-public class InsOrder implements Serializable {
+public class InsOrder extends OrderBy implements Serializable {
- /**
- *
- */
- @NotNull(message="[]涓嶈兘涓虹┖")
- @ApiModelProperty("")
+ @ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
+
/**
* 濮旀墭缂栧彿
*/
+ @ValueTableShow(2)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("濮旀墭缂栧彿")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
- /**
- * 鏍峰搧缂栫爜
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鏍峰搧缂栫爜")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String sampleCode;
+
/**
* 涓嬪崟瀹㈡埛
*/
+ @ValueTableShow(3)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("涓嬪崟瀹㈡埛")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String custom;
+
/**
* 涓嬪崟鍗曚綅
*/
+ @ValueTableShow(4)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("涓嬪崟鍗曚綅")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
+
/**
* 宸ュ巶鍩�
*/
+ @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("宸ュ巶鍩�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String code;
+
/**
* 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
*/
- @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
+ @ValueTableShow(6)
+ @ApiModelProperty("绱ф�ョ▼搴�")
private Integer type;
+
/**
* 绾﹀畾鏃堕棿
*/
+ @ValueTableShow(7)
@ApiModelProperty("绾﹀畾鏃堕棿")
- private Date appointed;
- /**
- * 瀹為獙瀹ゅ悕绉�
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("瀹為獙瀹ゅ悕绉�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String laboratory;
- /**
- * 鏍峰搧绫诲瀷
- */
- @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;
- /**
- * 鏍峰搧鍚嶇О
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鏍峰搧鍚嶇О")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String sample;
- /**
- * 鏍峰搧鏁伴噺
- */
- @ApiModelProperty("鏍峰搧鏁伴噺")
- private Double sampleNum;
- /**
- * 鏄惁鐣欐牱
- */
- @ApiModelProperty("鏄惁鐣欐牱")
- private Integer isLeave;
- /**
- * 鐣欐牱鏁伴噺
- */
- @ApiModelProperty("鐣欐牱鏁伴噺")
- private Integer leaveNum;
- /**
- * 妫�娴嬭繘搴�
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointed;
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("妫�娴嬭繘搴�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String insProgress;
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
- @ApiModelProperty("1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�")
+ @ApiModelProperty("妫�楠屽鐞�")
private Integer state;
+
/**
* 澶囨敞
*/
+ @ValueTableShow(9)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("澶囨敞")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String remark;
+
/**
* OTC璁㈠崟鍙�
*/
+ @ValueTableShow(10)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("OTC璁㈠崟鍙�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String otcCode;
+ @ValueTableShow(11)
@ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
+
/**
*
*/
+ @ValueTableShow(12)
@ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
+
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
/**
*
*/
+ @ValueTableShow(13)
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- /**
- * 澶栭敭锛氫笅鍗曞鎴� user琛╥d
- */
- @ApiModelProperty("澶栭敭锛氫笅鍗曞鎴� user琛╥d")
- private Integer userId;
}
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
index b7af605..bf057a2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -1,12 +1,14 @@
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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* 妫�楠屾牱鍝�
@@ -125,13 +127,11 @@
/**
*
*/
- private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime 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/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index 937e818..24cad7c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.pojo.InsOrder;
@@ -29,4 +30,6 @@
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrderParameter(InsOrder itemParameter);
+ int addInsOrder(InsOderDto insOderDto);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java
new file mode 100644
index 0000000..dfe6fd0
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.SampleOrder;
+
+import java.util.List;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 19:07
+ **/
+public interface SampleOrderService extends IService<SampleOrder> {
+ List<SampleOrder> selectSampleOrderList();
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 6dcaf57..a2c1f24 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.pojo.InsOrder;
@@ -63,6 +64,11 @@
public int upInsOrderParameter(InsOrder itemParameter) {
return insOrderMapper.updateById(itemParameter);
}
+
+ @Override
+ public int addInsOrder(InsOderDto insOderDto) {
+ return insOrderMapper.addInsOrder(insOderDto);
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java
new file mode 100644
index 0000000..b991fea
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java
@@ -0,0 +1,28 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.SampleOrder;
+import com.yuanchu.mom.mapper.SampleOrderMapper;
+import com.yuanchu.mom.service.SampleOrderService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 19:07
+ **/
+@Service
+@AllArgsConstructor
+public class SampleOrderServiceImpl extends ServiceImpl<SampleOrderMapper,SampleOrder> implements SampleOrderService {
+
+
+ private SampleOrderMapper sampleOrderMapper;
+
+ @Override
+ public List<SampleOrder> selectSampleOrderList() {
+ return sampleOrderMapper.selectSampleOrderList();
+ }
+}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 5e87dd2..9c99c2c 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -3,23 +3,14 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsOrderMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrder">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
- <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
<result property="custom" column="custom" jdbcType="VARCHAR"/>
<result property="company" column="company" jdbcType="VARCHAR"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="type" column="type" jdbcType="INTEGER"/>
<result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
- <result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="sampleNum" column="sample_num" jdbcType="DOUBLE"/>
- <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="state" column="state" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="otcCode" column="otc_code" jdbcType="VARCHAR"/>
@@ -39,6 +30,13 @@
otc_code,create_user,create_time,
update_user,update_time
</sql>
+
+ <select id="addInsOrder">
+ insert into ins_order
+ (entrust_code,sample_code,custom,company,code,type,laboratory,model,sample,sample_num,is_leave,leave_num,ins_progress,state,remark,otc_code,create_user,create_time,update_user,update_time)
+ values
+ (#{entrustCode},#{sampleCode},#{custom},#{company},#{code},#{type},#{appointedTime},#{laboratory},#{smapleType},#{model},#{sample},#{sampleNum},#{isLeave},#{leaveNum},#{insProgress},#{state},#{remark},#{otcCode},#{createUser},#{createTime},#{updateUser},#{updateTime})
+ </select>
<resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
<result property="id" column="id"/>
@@ -82,28 +80,20 @@
from (
select
id,
- entrust_code,
- sample_code,
- custom,
- company,
- code,
- type,
appointed,
- laboratory,
- sample_type,
- model,
- sample,
- sample_num,
- is_leave,
- leave_num,
- ins_progress,
- state,
- remark,
- otc_code,
+ user_id,
create_user,
- create_time,
+ otc_code,
+ code,
+ custom,
update_user,
- update_time
+ update_time,
+ type,
+ entrust_code,
+ company,
+ remark,
+ create_time,
+ state
from ins_order
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -114,32 +104,24 @@
<update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
UPDATE ins_order
<set>
- <if test="entrustCode!=null and entrustCode!='' ">entrust_code=#{entrustCode},</if>
- <if test="sample_Code!=null ">sample_code=#{sampleCode},</if>
- <if test="custom!=null ">custom=#{custom},</if>
- <if test="company!=null ">company=#{company}</if>
- <if test="code!=null ">code=#{code}</if>
- <if test="type!=null ">type=#{type}</if>
- <if test="appointed!=null ">appointed=#{appointed}</if>
- <if test="laboratory!=null ">laboratory=#{laboratory}</if>
- <if test="smapleType!=null ">smaple_type=#{smapleType}</if>
- <if test="model!=null ">model=#{model}</if>
- <if test="sample!=null ">sample=#{sample}</if>
- <if test="sampleNum!=null ">sample_num=#{sampleNum}</if>
- <if test="isLeave!=null ">is_leave=#{isLeave}</if>
- <if test="leaveNum!=null ">leave_num=#{leaveNum}</if>
- <if test="insProgress!=null ">ins_progress=#{insProgress}</if>
- <if test="state!=null ">state=#{state}</if>
- <if test="remark!=null ">remark=#{remark}</if>
- <if test="otcCode!=null ">otc_code=#{otcCode}</if>
+ <if test="appointed!=null and appointed!='' ">appointed=#{appointed},</if>
+ <if test="userId!=null ">user_id=#{userId},</if>
<if test="createUser!=null ">create_user=#{createUser}</if>
- <if test="createTime!=null ">create_time=#{createTime}</if>
+ <if test="otcCode!=null ">otc_code=#{otcCode}</if>
+ <if test="code!=null ">code=#{code}</if>
+ <if test="custom!=null ">custom=#{custom}</if>
<if test="updateUser!=null ">update_user=#{updateUser}</if>
<if test="updateTime!=null ">update_time=#{updateTime}</if>
+ <if test="type!=null ">type=#{type}</if>
+ <if test="entrustCode!=null ">entrust_code=#{entrustCode}</if>
+ <if test="company!=null ">company=#{company}</if>
+ <if test="remark!=null ">remark=#{remark}</if>
+ <if test="createTime!=null ">create_time=#{createTime}</if>
+ <if test="state!=null ">state=#{state}</if>
</set>
<where>
id=#{id}
- </where>
+ </where>-->
</update>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml b/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml
new file mode 100644
index 0000000..c2758e7
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml
@@ -0,0 +1,62 @@
+<?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.SampleOrderMapper">
+ <resultMap id="map" type="com.yuanchu.mom.dto.SampleOrder">
+ <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"/>
+ <association property="insOrderList" javaType="InsOrder">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
+ <result property="custom" column="custom" jdbcType="VARCHAR"/>
+ <result property="company" column="company" jdbcType="VARCHAR"/>
+ <result property="code" column="code" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="INTEGER"/>
+ <result property="appointed" column="appointed" jdbcType="TIMESTAMP"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="otcCode" column="otc_code" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </association>
+ </resultMap>
+ <select id="selectSampleOrderList" resultMap="map">
+ select * from(
+ select s.id,
+ s.join_name,
+ o.create_user,
+ o.create_time,
+ o.update_user,
+ o.update_time
+ from ins_sample s
+ left join ins_order o on s.ins_order_id = o.id
+ )a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3