From 08996b11833ab99f2553c2e4f1dc960e999a0d3c Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期四, 14 三月 2024 11:38:35 +0800
Subject: [PATCH] 检验下单 功能调整
---
system-run/src/main/resources/application-dev.yml | 2 +-
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 5 ++---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
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 4049bee..2ec16fe 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
@@ -68,7 +68,7 @@
@ApiModelProperty(value = "绾﹀畾鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd")
- private LocalDate appointedTime;
+ private LocalDate appointed;
/**
* 妫�娴嬭繘搴�
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 05b5572..5e87dd2 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -12,11 +12,10 @@
<result property="company" column="company" jdbcType="VARCHAR"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="type" column="type" jdbcType="INTEGER"/>
- <result property="appointedTime" column="appointed_time" jdbcType="TIMESTAMP"/>
+ <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="sample" column="sample" 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"/>
@@ -121,7 +120,7 @@
<if test="company!=null ">company=#{company}</if>
<if test="code!=null ">code=#{code}</if>
<if test="type!=null ">type=#{type}</if>
- <if test="appointedTime!=null ">appointed_time=#{appointedTime}</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>
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 8b6882a..f129e9a 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -35,7 +35,7 @@
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: user
+ username: root
password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
--
Gitblit v1.9.3