From 69e49a4181cc8827fd8f71b09fcf5387873e3f8c Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 29 二月 2024 13:06:34 +0800
Subject: [PATCH] 调整功能
---
system-run/src/main/resources/application-dev.yml | 4 ++--
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 12 ++++++++++++
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 5 ++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index f4101b3..ff977a5 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -45,6 +45,10 @@
@ApiModelProperty(value = "璁￠噺鍗曚綅")
private String unit;
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ private String method;
+
@ValueTableShow(6)
@ApiModelProperty(value = "鍗曚环(鍏�)")
private BigDecimal price;
@@ -52,6 +56,10 @@
@ValueTableShow(7)
@ApiModelProperty(value = "宸ユ椂(H)")
private Integer manHour;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ private Integer manDay;
@ValueTableShow(8)
@ApiModelProperty(value = "宸ユ椂鍒嗙粍")
@@ -77,6 +85,10 @@
@ApiModelProperty(value = "鍙栧�肩被鍨�")
private String valueType;
+ @ValueTableShow(13)
+ @ApiModelProperty(value = "鐗规畩鏍囪瘑")
+ private String bsm;
+
@ApiModelProperty(value = "鍒涘缓浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 21247e6..521e1c7 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -23,7 +23,10 @@
create_user,
update_user,
create_time,
- update_time
+ update_time,
+ method,
+ man_day,
+ bsm
from structure_item_parameter
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 751c503..3220344 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -34,7 +34,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.134:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: root
password: 123456
druid:
@@ -59,7 +59,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.0.134
+ host: 127.0.0.1
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3