From cf614786f177f2b426f1c08e9a5870d05e2d203d Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期六, 18 五月 2024 10:30:53 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html | 2
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml | 30 ++++-----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html | 5 +
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java | 73 +++++++++++------------
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html | 12 +++-
5 files changed, 62 insertions(+), 60 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
index b5b3d48..8c8426e 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Hole.java
@@ -98,17 +98,15 @@
@Excel(name = "鏃犳硶瀹氫綅鐨勫師鍥�")
private String reason;
- /** 鐜板満鎷嶇収1 */
- @Excel(name = "鐜板満鎷嶇収1")
- private String pic1;
- /** 鐜板満鎷嶇収2 */
- @Excel(name = "鐜板満鎷嶇収2")
- private String pic2;
+ /** 褰撳墠杩涘害 footageCpl/footage */
+ private Double rate;
- /** 鐜板満鎷嶇収3 */
- @Excel(name = "鐜板満鎷嶇収3")
- private String pic3;
+ /** 鎬昏繘灏� */
+ private Double footage;
+
+ /** 宸插畬鎴愯繘灏� */
+ private Double footageCpl;
/** 閽诲瓟鐘舵�� */
@Excel(name = "閽诲瓟鐘舵��")
@@ -120,6 +118,31 @@
/** 鏄惁琚紓甯告壂鎻忥紙0-鏈壂鎻忥紝1-宸叉壂鎻忥級 */
private String isFlag;
+
+ public Double getRate() {
+ return rate;
+ }
+
+ public void setRate(Double rate) {
+ this.rate = rate;
+ }
+
+ public Double getFootage() {
+ return footage;
+ }
+
+ public void setFootage(Double footage) {
+ this.footage = footage;
+ }
+
+ public Double getFootageCpl() {
+ return footageCpl;
+ }
+
+ public void setFootageCpl(Double footageCpl) {
+ this.footageCpl = footageCpl;
+ }
+
public void setIds(String ids)
{
@@ -301,33 +324,7 @@
{
return reason;
}
- public void setPic1(String pic1)
- {
- this.pic1 = pic1;
- }
- public String getPic1()
- {
- return pic1;
- }
- public void setPic2(String pic2)
- {
- this.pic2 = pic2;
- }
-
- public String getPic2()
- {
- return pic2;
- }
- public void setPic3(String pic3)
- {
- this.pic3 = pic3;
- }
-
- public String getPic3()
- {
- return pic3;
- }
public void setStatus(String status)
{
this.status = status;
@@ -380,9 +377,9 @@
.append("position", getPosition())
.append("locateTime", getLocateTime())
.append("reason", getReason())
- .append("pic1", getPic1())
- .append("pic2", getPic2())
- .append("pic3", getPic3())
+ .append("rate", getRate())
+ .append("footage", getFootage())
+ .append("footageCpl", getFootageCpl())
.append("status", getStatus())
.append("isDeleted", getIsDeleted())
.append("isFlag", getIsFlag())
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml
index 396c8c0..11ea16e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleMapper.xml
@@ -27,16 +27,16 @@
<result property="position" column="position" />
<result property="locateTime" column="locate_time" />
<result property="reason" column="reason" />
- <result property="pic1" column="pic1" />
- <result property="pic2" column="pic2" />
- <result property="pic3" column="pic3" />
+ <result property="rate" column="rate" />
+ <result property="footage" column="footage" />
+ <result property="footageCpl" column="footage_cpl" />
<result property="status" column="status" />
<result property="isDeleted" column="is_deleted" />
<result property="isFlag" column="is_flag" />
</resultMap>
<sql id="selectHoleVo">
- select ids, project_id, code, create_time, update_time, description, type, elevation, depth, longitude, latitude, survey_x, survey_y, survey_z, survey_latitude, survey_longitude, map_latitude, map_longitude, map_time, position, locate_time, reason, pic1, pic2, pic3, status, is_deleted, is_flag from js_hole
+ select ids, project_id, code, create_time, update_time, description, type, elevation, depth, longitude, latitude, survey_x, survey_y, survey_z, survey_latitude, survey_longitude, map_latitude, map_longitude, map_time, position, locate_time, reason, rate, footage, footage_cpl, status, is_deleted, is_flag from js_hole
</sql>
<select id="selectHoleList" parameterType="Hole" resultMap="HoleResult">
@@ -61,9 +61,7 @@
<if test="position != null and position != ''"> and position = #{position}</if>
<if test="locateTime != null "> and locate_time = #{locateTime}</if>
<if test="reason != null and reason != ''"> and reason = #{reason}</if>
- <if test="pic1 != null and pic1 != ''"> and pic1 = #{pic1}</if>
- <if test="pic2 != null and pic2 != ''"> and pic2 = #{pic2}</if>
- <if test="pic3 != null and pic3 != ''"> and pic3 = #{pic3}</if>
+
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="isDeleted != null and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
<if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
@@ -126,9 +124,9 @@
<if test="position != null and position != ''">position,</if>
<if test="locateTime != null ">locate_time,</if>
<if test="reason != null and reason != ''">reason,</if>
- <if test="pic1 != null and pic1 != ''">pic1,</if>
- <if test="pic2 != null and pic2 != ''">pic2,</if>
- <if test="pic3 != null and pic3 != ''">pic3,</if>
+ <if test="rate != null">rate,</if>
+ <if test="footage != null">footage,</if>
+ <if test="footageCpl != null">footage_cpl,</if>
<if test="status != null and status != ''">status,</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted,</if>
<if test="isFlag != null and isFlag != ''">is_flag,</if>
@@ -156,9 +154,9 @@
<if test="position != null and position != ''">#{position},</if>
<if test="locateTime != null ">#{locateTime},</if>
<if test="reason != null and reason != ''">#{reason},</if>
- <if test="pic1 != null and pic1 != ''">#{pic1},</if>
- <if test="pic2 != null and pic2 != ''">#{pic2},</if>
- <if test="pic3 != null and pic3 != ''">#{pic3},</if>
+ <if test="rate != null">#{rate},</if>
+ <if test="footage != null">#{footage},</if>
+ <if test="footageCpl != null">#{footageCpl},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
<if test="isFlag != null and isFlag != ''">#{isFlag},</if>
@@ -189,9 +187,9 @@
<if test="position != null and position != ''">position = #{position},</if>
<if test="locateTime != null ">locate_time = #{locateTime},</if>
<if test="reason != null and reason != ''">reason = #{reason},</if>
- <if test="pic1 != null and pic1 != ''">pic1 = #{pic1},</if>
- <if test="pic2 != null and pic2 != ''">pic2 = #{pic2},</if>
- <if test="pic3 != null and pic3 != ''">pic3 = #{pic3},</if>
+ <if test="rate != null">rate = #{rate},</if>
+ <if test="footage != null">footage = #{footage},</if>
+ <if test="footageCpl != null">footage_cpl = #{footageCpl},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted = #{isDeleted},</if>
<if test="isFlag != null and isFlag != ''">is_flag = #{isFlag},</if>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
index 1bbcaeb..1648534 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/add.html
@@ -38,11 +38,12 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">杩涘害锛�</label>
+ <label class="col-sm-3 control-label">鎬昏繘灏猴細</label>
<div class="col-sm-8">
- <input name="pic1" class="form-control" type="text" placeholder="璇疯緭鍏ヨ繘搴︽暟瀛楋紙渚嬶細10浠ｈ〃10%锛�">
+ <input name="footage" class="form-control" type="text" placeholder="璇疯緭鍏ユ�昏繘灏�">
</div>
</div>
+
</form>
</div>
<th:block th:include="include :: footer" />
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
index ecdff4f..d6b2646 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html
@@ -47,10 +47,16 @@
</div>
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">杩涘害锛�</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鎬昏繘灏猴紙m锛夛細</label>
<div class="col-sm-8">
- <input name="pic1" th:field="*{pic1}" class="form-control" type="text" placeholder="璇疯緭鍏ヨ繘搴︽暟瀛楋紙渚嬶細10浠ｈ〃10%锛�">
+ <input name="footage" th:field="*{footage}" class="form-control" type="text" placeholder="璇疯緭鍏ユ�昏繘灏�,鍗曚綅锛坢锛�">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">宸插畬鎴愯繘灏猴紙m锛夛細</label>
+ <div class="col-sm-8">
+ <input name="footageCpl" th:field="*{footageCpl}" class="form-control" type="text" placeholder="璇疯緭鍏ュ凡瀹屾垚杩涘昂,鍗曚綅锛坢锛�">
</div>
</div>
</form>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
index 11fd90d..0079353 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
@@ -110,7 +110,7 @@
}
},
{
- field : 'pic1',
+ field : 'rate',
title : '杩涘害',
},
{
--
Gitblit v1.9.1