From f9d8ff7173608dd073c15dd362267245d3bd063e Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期二, 21 五月 2024 14:48:19 +0800
Subject: [PATCH] 绑定holeCode
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html | 8 ++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html | 8 ++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html | 8 ++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectData.java | 134 +++++++++++++++++++++++---------------------
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml | 12 ++--
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html | 8 ++
6 files changed, 106 insertions(+), 72 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectData.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectData.java
index 399fd5e..5db09aa 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectData.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectData.java
@@ -7,131 +7,137 @@
/**
* 椤圭洰璧勬枡瀵硅薄 js_project_data
- *
+ *
* @author cxy
* @date 2024-05-16
*/
-public class ProjectData extends BaseEntity
-{
+public class ProjectData extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 涓婚敭 */
+ /**
+ * 涓婚敭
+ */
private String id;
- /** 椤圭洰id */
+ /**
+ * 椤圭洰id
+ */
private String projectId;
- /** 閽诲瓟id */
- private String holeId;
+ /**
+ * 閽诲瓟Code
+ */
+ private String holeCode;
- /** 璧勬枡鍚嶇О */
+ /**
+ * 璧勬枡鍚嶇О
+ */
@Excel(name = "璧勬枡鍚嶇О")
private String name;
- /** 璧勬枡绫诲瀷 */
+ /**
+ * 璧勬枡绫诲瀷
+ */
@Excel(name = "璧勬枡绫诲瀷")
private String dataType;
- /** 璧勬枡璺緞 */
+ /**
+ * 璧勬枡璺緞
+ */
private String dataUrl;
- /** 鏂囦欢绫诲瀷 */
+ /**
+ * 鏂囦欢绫诲瀷
+ */
@Excel(name = "鏂囦欢绫诲瀷")
private String fileType;
- /** 鏍囩 */
+ /**
+ * 鏍囩
+ */
@Excel(name = "鏍囩")
private String labels;
- public void setId(String id)
- {
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
this.id = id;
}
- public String getId()
- {
- return id;
+ public String getProjectId() {
+ return projectId;
}
- public void setProjectId(String projectId)
- {
+
+ public void setProjectId(String projectId) {
this.projectId = projectId;
}
- public String getProjectId()
- {
- return projectId;
- }
- public void setHoleId(String holeId)
- {
- this.holeId = holeId;
+ public String getHoleCode() {
+ return holeCode;
}
- public String getHoleId()
- {
- return holeId;
+ public void setHoleCode(String holeCode) {
+ this.holeCode = holeCode;
}
- public void setName(String name)
- {
+
+ public void setName(String name) {
this.name = name;
}
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setDataType(String dataType)
- {
+
+ public void setDataType(String dataType) {
this.dataType = dataType;
}
- public String getDataType()
- {
+ public String getDataType() {
return dataType;
}
- public void setDataUrl(String dataUrl)
- {
+
+ public void setDataUrl(String dataUrl) {
this.dataUrl = dataUrl;
}
- public String getDataUrl()
- {
+ public String getDataUrl() {
return dataUrl;
}
- public void setFileType(String fileType)
- {
+
+ public void setFileType(String fileType) {
this.fileType = fileType;
}
- public String getFileType()
- {
+ public String getFileType() {
return fileType;
}
- public void setLabels(String labels)
- {
+
+ public void setLabels(String labels) {
this.labels = labels;
}
- public String getLabels()
- {
+ public String getLabels() {
return labels;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("projectId", getProjectId())
- .append("holeId", getHoleId())
- .append("name", getName())
- .append("dataType", getDataType())
- .append("dataUrl", getDataUrl())
- .append("fileType", getFileType())
- .append("labels", getLabels())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("projectId", getProjectId())
+ .append("holeCode", getHoleCode())
+ .append("name", getName())
+ .append("dataType", getDataType())
+ .append("dataUrl", getDataUrl())
+ .append("fileType", getFileType())
+ .append("labels", getLabels())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml
index 2648c83..9d10598 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml
@@ -7,7 +7,7 @@
<resultMap type="ProjectData" id="ProjectDataResult">
<result property="id" column="id" />
<result property="projectId" column="project_id" />
- <result property="holeId" column="hole_id" />
+ <result property="holeCode" column="hole_code" />
<result property="name" column="name" />
<result property="dataType" column="data_type" />
<result property="dataUrl" column="data_url" />
@@ -21,14 +21,14 @@
</resultMap>
<sql id="selectProjectDataVo">
- select id, project_id, hole_id, name, data_type, data_url, file_type, labels, create_by, create_time, update_by, update_time, remark from js_project_data
+ select id, project_id, hole_code, name, data_type, data_url, file_type, labels, create_by, create_time, update_by, update_time, remark from js_project_data
</sql>
<select id="selectProjectDataList" parameterType="ProjectData" resultMap="ProjectDataResult">
<include refid="selectProjectDataVo"/>
<where>
<if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
- <if test="holeId != null and holeId != ''"> and hole_id = #{holeId}</if>
+ <if test="holeCode != null and holeCode != ''"> and hole_code = #{holeCode}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="dataType != null and dataType != ''"> and data_type = #{dataType}</if>
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
@@ -46,7 +46,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="projectId != null and projectId != ''">project_id,</if>
- <if test="holeId != null and holeId != ''">hole_id,</if>
+ <if test="holeCode != null and holeCode != ''">hole_code,</if>
<if test="name != null and name != ''">name,</if>
<if test="dataType != null and dataType != ''">data_type,</if>
<if test="dataUrl != null and dataUrl != ''">data_url,</if>
@@ -61,7 +61,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="projectId != null and projectId != ''">#{projectId},</if>
- <if test="holeId != null and holeId != ''">#{holeId},</if>
+ <if test="holeCode != null and holeCode != ''">#{holeCode},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="dataType != null and dataType != ''">#{dataType},</if>
<if test="dataUrl != null and dataUrl != ''">#{dataUrl},</if>
@@ -79,7 +79,7 @@
update js_project_data
<trim prefix="SET" suffixOverrides=",">
<if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
- <if test="holeId != null and holeId != ''">hole_id = #{holeId},</if>
+ <if test="holeCode != null and holeCode != ''">hole_code = #{holeCode},</if>
<if test="name != null and name != ''">name = #{name},</if>
<if test="dataType != null and dataType != ''">data_type = #{dataType},</if>
<if test="dataUrl != null and dataUrl != ''">data_url = #{dataUrl},</if>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html
index 4ed9e63..f923279 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html
@@ -6,12 +6,18 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-projectData-add">
- <div class="form-group">
+ <div class="form-group">
<label class="col-sm-3 control-label">璧勬枡鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">閽诲瓟缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="holeCode" class="form-control" type="text">
+ </div>
+ </div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">璧勬枡绫诲瀷锛�</label>-->
<!-- <div class="col-sm-8">-->
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html
index 1c29812..a358fe0 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html
@@ -7,12 +7,18 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-projectData-edit" th:object="${projectData}">
<input name="id" th:field="*{id}" type="hidden">
- <div class="form-group">
+ <div class="form-group">
<label class="col-sm-3 control-label">璧勬枡鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="name" th:field="*{name}" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">閽诲瓟缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="holeCode" th:field="*{holeCode}" class="form-control" type="text">
+ </div>
+ </div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">璧勬枡绫诲瀷锛�</label>-->
<!-- <div class="col-sm-8">-->
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
index 5896ff9..c919e85 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
@@ -15,6 +15,10 @@
<input type="text" name="name"/>
</li>
<li>
+ <p>閽诲瓟缂栧彿锛�</p>
+ <input type="text" name="holeCode"/>
+ </li>
+ <li>
<p>鏍囩锛�</p>
<input type="text" name="labels"/>
</li>
@@ -76,6 +80,10 @@
field : 'name',
title : '璧勬枡鍚嶇О'
},
+ {
+ field : 'holeCode',
+ title : '閽诲瓟缂栧彿'
+ },
{
field : 'labels',
title : '鏍囩'
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html
index aba6d71..f5683e3 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html
@@ -15,6 +15,10 @@
<input type="text" name="name"/>
</li>
<li>
+ <p>閽诲瓟缂栧彿锛�</p>
+ <input type="text" name="holeCode"/>
+ </li>
+ <li>
<p>涓氬姟绫诲瀷锛�</p>
<select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
<option value="">鎵�鏈�</option>
@@ -82,6 +86,10 @@
field : 'name',
title : '璧勬枡鍚嶇О'
},
+ {
+ field : 'holeCode',
+ title : '閽诲瓟缂栧彿'
+ },
{
field : 'fileType',
title : '涓氬姟绫诲瀷',
--
Gitblit v1.9.1