From 3282abd1d4dd2dd4a4167e027e609a52ceb8c728 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期二, 21 五月 2024 10:26:29 +0800
Subject: [PATCH] 人员管理模块
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectPersonServiceImpl.java | 27 +++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectPersonController.java | 12 +
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java | 223 +++++++++++++++++++--------
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html | 45 +++++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html | 18 ++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectPersonService.java | 9 +
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml | 32 +++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html | 2
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html | 98 ++++++++++++
9 files changed, 397 insertions(+), 69 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectPersonController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectPersonController.java
index f014bab..17d7c24 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectPersonController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectPersonController.java
@@ -19,6 +19,9 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.poi.ExcelUtil;
import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 椤圭洰浜哄憳Controller
@@ -118,4 +121,13 @@
public AjaxResult remove(String ids) {
return toAjax(projectPersonService.deleteProjectPersonByIds(ids));
}
+
+ /**
+ * 涓婁紶鍥剧墖
+ */
+ @PostMapping("/uploadImg")
+ @ResponseBody
+ public AjaxResult uploadImg(MultipartFile file, HttpServletRequest request){
+ return projectPersonService.uploadImg(file,request);
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java
index 4b1904d..171201f 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectPerson.java
@@ -5,107 +5,154 @@
import com.javaweb.common.annotation.Excel;
import com.javaweb.common.core.domain.BaseEntity;
+import java.util.Date;
+
/**
* 椤圭洰浜哄憳瀵硅薄 js_project_person
- *
+ *
* @author cxy
* @date 2024-05-16
*/
-public class ProjectPerson extends BaseEntity
-{
+public class ProjectPerson extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** id */
+ /**
+ * id
+ */
private String ids;
- /** 椤圭洰id */
+ /**
+ * 椤圭洰id
+ */
private String projectId;
- /** 閽诲瓟id */
+ /**
+ * 閽诲瓟id
+ */
private String holeId;
- /** 浜哄憳鍚嶇О */
+ /**
+ * 浜哄憳鍚嶇О
+ */
@Excel(name = "浜哄憳鍚嶇О")
private String name;
- /** 绫诲瀷 */
+ /**
+ * 绫诲瀷
+ */
@Excel(name = "绫诲瀷")
private String type;
- /** 鎵嬫満鍙� */
+ /**
+ * 鎵嬫満鍙�
+ */
@Excel(name = "鎵嬫満鍙�")
private String phone;
- /** 韬唤璇佸彿 */
+ /**
+ * 韬唤璇佸彿
+ */
@Excel(name = "韬唤璇佸彿")
private String idCard;
- /** 浜哄憳鍒嗙粍 */
+ /**
+ * 浜哄憳鍒嗙粍
+ */
@Excel(name = "浜哄憳鍒嗙粍")
private String personGroup;
- /** 鑱岃矗 */
+ /**
+ * 鑱岃矗
+ */
@Excel(name = "鑱岃矗")
private String responsibility;
- /** 鐘舵�� */
+
+ /**
+ * 杩涘満鏃堕棿
+ */
+ @Excel(name = "杩涘満鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date inSiteTime;
+
+ /**
+ * 鍑哄満鏃堕棿
+ */
+ @Excel(name = "鍑哄満鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date outSiteTime;
+
+ /**
+ * 璇佷欢绫诲瀷
+ */
+ @Excel(name = "璇佷欢绫诲瀷")
+ private String documentType;
+
+ /**
+ * 璇佷欢缂栧彿
+ */
+ @Excel(name = "璇佷欢缂栧彿")
+ private String documentCode;
+
+ /**
+ * 璇佷欢url
+ */
+ @Excel(name = "璇佷欢url")
+ private String documentPath;
+
+ /**
+ * 鐘舵��
+ */
private String status;
- /** 鏄惁鍒犻櫎锛�0 鏈垹闄� 1鍒犻櫎锛� */
+ /**
+ * 鏄惁鍒犻櫎锛�0 鏈垹闄� 1鍒犻櫎锛�
+ */
private String isDeleted;
- public void setIds(String ids)
- {
+ public void setIds(String ids) {
this.ids = ids;
}
- public String getIds()
- {
+ public String getIds() {
return ids;
}
- public void setProjectId(String projectId)
- {
+
+ public void setProjectId(String projectId) {
this.projectId = projectId;
}
- public String getProjectId()
- {
+ public String getProjectId() {
return projectId;
}
- public void setHoleId(String holeId)
- {
+
+ public void setHoleId(String holeId) {
this.holeId = holeId;
}
- public String getHoleId()
- {
+ public String getHoleId() {
return holeId;
}
- public void setName(String name)
- {
+
+ public void setName(String name) {
this.name = name;
}
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setType(String type)
- {
+
+ public void setType(String type) {
this.type = type;
}
- public String getType()
- {
+ public String getType() {
return type;
}
- public void setPhone(String phone)
- {
+
+ public void setPhone(String phone) {
this.phone = phone;
}
- public String getPhone()
- {
+ public String getPhone() {
return phone;
}
@@ -125,51 +172,95 @@
this.personGroup = personGroup;
}
- public void setResponsibility(String responsibility)
- {
+ public void setResponsibility(String responsibility) {
this.responsibility = responsibility;
}
- public String getResponsibility()
- {
+ public String getResponsibility() {
return responsibility;
}
- public void setStatus(String status)
- {
+
+
+ public Date getInSiteTime() {
+ return inSiteTime;
+ }
+
+ public void setInSiteTime(Date inSiteTime) {
+ this.inSiteTime = inSiteTime;
+ }
+
+ public void setOutSiteTime(Date outSiteTime) {
+ this.outSiteTime = outSiteTime;
+ }
+
+ public Date getOutSiteTime() {
+ return outSiteTime;
+ }
+
+ public void setDocumentType(String documentType) {
+ this.documentType = documentType;
+ }
+
+ public String getDocumentType() {
+ return documentType;
+ }
+
+ public void setDocumentCode(String documentCode) {
+ this.documentCode = documentCode;
+ }
+
+ public String getDocumentCode() {
+ return documentCode;
+ }
+
+ public void setDocumentPath(String documentPath) {
+ this.documentPath = documentPath;
+ }
+
+ public String getDocumentPath() {
+ return documentPath;
+ }
+
+
+ public void setStatus(String status) {
this.status = status;
}
- public String getStatus()
- {
+
+ public String getStatus() {
return status;
}
- public void setIsDeleted(String isDeleted)
- {
+
+ public void setIsDeleted(String isDeleted) {
this.isDeleted = isDeleted;
}
- public String getIsDeleted()
- {
+ public String getIsDeleted() {
return isDeleted;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("ids", getIds())
- .append("projectId", getProjectId())
- .append("holeId", getHoleId())
- .append("name", getName())
- .append("type", getType())
- .append("phone", getPhone())
- .append("responsibility", getResponsibility())
- .append("status", getStatus())
- .append("isDeleted", getIsDeleted())
- .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("ids", getIds())
+ .append("projectId", getProjectId())
+ .append("holeId", getHoleId())
+ .append("name", getName())
+ .append("type", getType())
+ .append("phone", getPhone())
+ .append("responsibility", getResponsibility())
+ .append("inSiteTime", getInSiteTime())
+ .append("outSiteTime", getOutSiteTime())
+ .append("documentType", getDocumentType())
+ .append("documentCode", getDocumentCode())
+ .append("documentPath", getDocumentPath())
+ .append("status", getStatus())
+ .append("isDeleted", getIsDeleted())
+ .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/java/com/javaweb/geo/service/IProjectPersonService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectPersonService.java
index f635523..297c38c 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectPersonService.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectPersonService.java
@@ -1,6 +1,10 @@
package com.javaweb.geo.service;
+import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.geo.domain.ProjectPerson;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -58,4 +62,9 @@
* @return 缁撴灉
*/
public int deleteProjectPersonById(String ids);
+
+ /**
+ * 涓婁紶鍥剧墖
+ */
+ AjaxResult uploadImg(MultipartFile file, HttpServletRequest request);
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectPersonServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectPersonServiceImpl.java
index 2736c43..ae68ff0 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectPersonServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectPersonServiceImpl.java
@@ -1,6 +1,8 @@
package com.javaweb.geo.service.impl;
import java.util.List;
+
+import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.DateUtils;
import com.javaweb.common.utils.IdGenerate;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +12,9 @@
import com.javaweb.geo.service.IProjectPersonService;
import com.javaweb.common.core.text.Convert;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 椤圭洰浜哄憳Service涓氬姟灞傚鐞�
@@ -98,4 +103,26 @@
{
return projectPersonMapper.deleteProjectPersonById(ids);
}
+
+ /**
+ * 涓婁紶鍥剧墖
+ */
+ @Override
+ public AjaxResult uploadImg(MultipartFile file, HttpServletRequest request) {
+ String originalFilename = file.getOriginalFilename();
+ //浼犲叆鐨勯捇瀛旂殑id
+ String projectId = request.getParameter("projectId");
+
+ //鑾峰彇鍚庣紑.zip 淇濆瓨鐨勬枃浠跺悕
+ String substring = originalFilename.substring(originalFilename.lastIndexOf("."));
+ String UID = IdGenerate.nextId();
+ String dFileName = UID + substring;
+
+
+
+
+
+
+ return null;
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml
index b878eed..11b176d 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml
@@ -14,6 +14,11 @@
<result property="idCard" column="id_card" />
<result property="personGroup" column="person_group" />
<result property="responsibility" column="responsibility" />
+ <result property="inSiteTime" column="in_site_time" />
+ <result property="outSiteTime" column="out_site_time" />
+ <result property="documentType" column="document_type" />
+ <result property="documentCode" column="document_code" />
+ <result property="documentPath" column="document_path" />
<result property="status" column="status" />
<result property="isDeleted" column="is_deleted" />
<result property="createBy" column="create_by" />
@@ -24,17 +29,25 @@
</resultMap>
<sql id="selectProjectPersonVo">
- select ids, project_id, hole_id, name, type, phone, id_card , person_group , responsibility, status, is_deleted, create_by, create_time, update_by, update_time, remark from js_project_person
+ select ids, project_id, hole_id, name, type, phone, id_card , person_group , responsibility, in_site_time, out_site_time, document_type, document_code, document_path, status, is_deleted, create_by, create_time, update_by, update_time, remark from js_project_person
</sql>
<select id="selectProjectPersonList" parameterType="ProjectPerson" resultMap="ProjectPersonResult">
<include refid="selectProjectPersonVo"/>
<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="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
- <if test="remark != null and remark != ''"> and remark = #{remark}</if>
+ <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
+ <if test="personGroup != null and personGroup != ''"> and person_group = #{personGroup}</if>
+ <if test="responsibility != null and responsibility != ''"> and responsibility = #{responsibility}</if>
+ <if test="inSiteTime != null "> and in_site_time = #{inSiteTime}</if>
+ <if test="outSiteTime != null "> and out_site_time = #{outSiteTime}</if>
+ <if test="documentType != null and documentType != ''"> and document_type = #{documentType}</if>
+ <if test="documentCode != null and documentCode != ''"> and document_code = #{documentCode}</if>
+ <if test="documentPath != null and documentPath != ''"> and document_path = #{documentPath}</if>
</where>
</select>
@@ -55,6 +68,11 @@
<if test="idCard != null and idCard != ''">id_card,</if>
<if test="personGroup != null and personGroup != ''">person_group,</if>
<if test="responsibility != null and responsibility != ''">responsibility,</if>
+ <if test="inSiteTime != null ">in_site_time,</if>
+ <if test="outSiteTime != null ">out_site_time,</if>
+ <if test="documentType != null and documentType != ''">document_type,</if>
+ <if test="documentCode != null and documentCode != ''">document_code,</if>
+ <if test="documentPath != null and documentPath != ''">document_path,</if>
<if test="status != null and status != ''">status,</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@@ -73,6 +91,11 @@
<if test="idCard != null and idCard != ''">#{idCard},</if>
<if test="personGroup != null and personGroup != ''">#{personGroup},</if>
<if test="responsibility != null and responsibility != ''">#{responsibility},</if>
+ <if test="inSiteTime != null ">#{inSiteTime},</if>
+ <if test="outSiteTime != null ">#{outSiteTime},</if>
+ <if test="documentType != null and documentType != ''">#{documentType},</if>
+ <if test="documentCode != null and documentCode != ''">#{documentCode},</if>
+ <if test="documentPath != null and documentPath != ''">#{documentPath},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -94,6 +117,11 @@
<if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
<if test="personGroup != null and personGroup != ''">person_group = #{personGroup},</if>
<if test="responsibility != null and responsibility != ''">responsibility = #{responsibility},</if>
+ <if test="inSiteTime != null ">in_site_time = #{inSiteTime},</if>
+ <if test="outSiteTime != null ">out_site_time = #{outSiteTime},</if>
+ <if test="documentType != null and documentType != ''">document_type = #{documentType},</if>
+ <if test="documentCode != null and documentCode != ''">document_code = #{documentCode},</if>
+ <if test="documentPath != null and documentPath != ''">document_path = #{documentPath},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted = #{isDeleted},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html
index ae27303..b02bb26 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/upload.html
@@ -20,7 +20,7 @@
</li>
<li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="upload()"><i class="fa fa-search"></i> 涓婁紶</a>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="upload()"><i class="fa fa-upload"></i> 涓婁紶</a>
</li>
</ul>
</div>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html
index e023eaa..97525c4 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/add.html
@@ -2,6 +2,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('鏂板椤圭洰浜哄憳')" />
+ <th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -44,9 +45,60 @@
<input name="responsibility" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">杩涘満鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="inSiteTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鍑哄満鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="outSiteTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璇佷欢绫诲瀷锛�</label>
+ <div class="col-sm-8">
+ <input name="documentType" 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="documentCode" class="form-control" type="text">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">涓婁紶璇佷欢锛�</label>
+ <div class="col-sm-8">
+ <form id="formId" enctype="multipart/form-data">
+ <div class="select-list">
+ <ul>
+ <li>
+ <input type="file" id="file" name="file"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="upload()"><i class="fa fa-upload"></i> 涓婁紶</a>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ </div>
+
+
</form>
</div>
<th:block th:include="include :: footer" />
+ <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "geo/projectPerson"
var projectId = [[${projectId}]];
@@ -62,6 +114,52 @@
$.operate.save(prefix + "/add", data);
}
}
+
+ $("input[name='inSiteTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+ $("input[name='outSiteTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+ function upload(){
+ var file = $('#file').val();
+ if (file == '' || (!$.common.endWith(file, '.png'))){
+ $.modal.msgWarning("璇烽�夋嫨寰呬笂浼犵殑鏂囦欢");
+ return false;
+ }
+
+ var formData = new FormData();
+ formData.append("file", $('#file')[0].files[0]);
+ formData.append("projectId", projectId);
+ $.modal.loading("鏁版嵁涓婁紶瑙ｆ瀽涓�");
+
+ $.ajax({
+ url: ctx + "geo/projectPerson/uploadImg",
+ data: formData,
+ cache: false,
+ contentType: false,
+ processData: false,
+ type: 'POST',
+ success: function (result) {
+ if (result.code == web_status.SUCCESS) {
+ $.modal.closeLoading();
+ $.modal.alertSuccess(result.msg);
+ } else if (result.code == web_status.WARNING) {
+ $.modal.closeLoading();
+ $.modal.alertWarning(result.msg)
+ } else {
+ $.modal.closeLoading();
+ $.modal.alertError(result.msg);
+ }
+ }
+ });
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html
index 252804b..482bb42 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/edit.html
@@ -2,6 +2,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('淇敼椤圭洰浜哄憳')" />
+ <th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -45,9 +46,40 @@
<input name="responsibility" th:field="*{responsibility}" class="form-control" type="text">
</div>
</div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">杩涘満鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="inSiteTime" th:value="${#dates.format(projectPerson.inSiteTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鍑哄満鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="outSiteTime" th:value="${#dates.format(projectPerson.outSiteTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璇佷欢绫诲瀷锛�</label>
+ <div class="col-sm-8">
+ <input name="documentType" th:field="*{documentType}" 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="documentCode" th:field="*{documentCode}" class="form-control" type="text">
+ </div>
+ </div>
</form>
</div>
<th:block th:include="include :: footer" />
+ <th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "geo/projectPerson";
$("#form-projectPerson-edit").validate({
@@ -59,6 +91,19 @@
$.operate.save(prefix + "/edit", $('#form-projectPerson-edit').serialize());
}
}
+
+
+ $("input[name='inSiteTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+ $("input[name='outSiteTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
index 92f8fe4..fe78dd4 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectPerson/projectPerson.html
@@ -104,6 +104,24 @@
field : 'responsibility',
title : '鑱岃矗'
},
+ {
+ field : 'inSiteTime',
+ title : '杩涘満鏃堕棿'
+ },
+ {
+ field : 'outSiteTime',
+ title : '鍑哄満鏃堕棿'
+ },
+ {
+ field : 'documentType',
+ title : '璇佷欢绫诲瀷',
+ visible: false
+ },
+ {
+ field : 'documentCode',
+ title : '璇佷欢缂栧彿',
+ visible: false
+ },
{
field : 'remark',
title : '澶囨敞'
--
Gitblit v1.9.1