修改

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/entity/ConstructionProject.java

@@ -183,11 +183,11 @@ public class ConstructionProject extends DataEntity<ConstructionProject> {
     public void setConstructionUnit(String constructionUnit) {
         this.constructionUnit = constructionUnit;
     }
-    @JsonFormat(pattern = "YYYY-MM-DD")
+    @JsonFormat(pattern = "YYYY-MM")
     public Date getArrangeTime() {
         return arrangeTime;
     }
-    @JsonFormat(pattern = "YYYY-MM-DD")
+    @JsonFormat(pattern = "YYYY-MM")
     public void setArrangeTime(Date arrangeTime) {
         this.arrangeTime = arrangeTime;
     }

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/mapper/ConstructionProjectMapper.java

@@ -9,4 +9,12 @@ import java.util.List;
 @MyBatisMapper
 public interface ConstructionProjectMapper extends BaseMapper<ConstructionProject> {
     Integer insertList(@Param("list") List<ConstructionProject> list);
+
+    Integer updateStatus(ConstructionProject constructionProject);
+
+    Integer updateSpecificTime(ConstructionProject constructionProject);
+
+    Integer updateSpecificLine(@Param(value = "list") List<ConstructionProject> list);
+
+    Integer updateArrangeTimeLine(@Param(value = "list") List<ConstructionProject> list);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/mapper/xml/ConstructionProjectMapper.xml

@@ -47,6 +47,18 @@
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
+			<if test="projectStatus != null and  projectStatus != ''">
+				AND a.projectStatus = #{projectStatus}
+			</if>
+			<if test="id != null and id != ''">
+				AND a.id = #{id}
+			</if>
+			<if test="lineName != null and lineName != ''">
+				AND a.lineName = #{lineName}
+			</if>
+			<if test="arrangeTime != null">
+				AND a.arrangeTime = #{arrangeTime}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -227,8 +239,45 @@
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+	<!--安排计划项目-->
+	<update id="updateStatus">
+		UPDATE ms_construction_project SET
+			arrangeTime = #{arrangeTime},
+			projectStatus = #{projectStatus}
+		WHERE id = #{id}
+	</update>
+
+	<!--安排计划项目具体时间单独-->
+	<update id="updateSpecificTime">
+		UPDATE ms_construction_project SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			specificTime = #{specificTime}
+		WHERE id = #{id}
+	</update>
+
+	<!--安排计划项目具体时间，根据项目进行分类-->
+	<update id="updateSpecificLine">
+		<foreach collection="list" item="item" index="index" open="" close="" separator=",">
+			UPDATE ms_construction_project SET
+				update_by = #{item.updateBy.id},
+				update_date = #{item.updateDate},
+				specificTime = #{item.specificTime}
+			WHERE id = #{item.id}
+		</foreach>
+	</update>
+
+	<!--安排计划项目具体时间，根据项目进行分类-->
+	<update id="updateArrangeTimeLine">
+		<foreach collection="list" item="item" index="index" open="" close="" separator=",">
+			UPDATE ms_construction_project SET
+			update_by = #{item.updateBy.id},
+			update_date = #{item.updateDate},
+			arrangeTime = #{item.arrangeTime}
+			WHERE id = #{item.id}
+		</foreach>
+	</update>
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject" statementType="STATEMENT">
 		select * FROM ms_construction_project  where ${id} = '${value}'

src/main/java/com/jeeplus/modules/sg/managementcenter/constructionProject/service/ConstructionProjectService.java

@@ -7,10 +7,12 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject;
 import com.jeeplus.modules.sg.managementcenter.constructionProject.mapper.ConstructionProjectMapper;
+import com.jeeplus.modules.sg.managementcenter.constructionProject.util.TreeTableUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -46,5 +48,31 @@ public class ConstructionProjectService extends CrudService<ConstructionProjectM
 		}
 		constructionProjectMapper.insertList(list);
 	}
+	//修改计划安排事件状态
+	@Transactional(readOnly = false)
+	public void updateStatus(ConstructionProject constructionProject){
+		constructionProjectMapper.updateStatus(constructionProject);
+	}
+
+	//安排具体时间
+	@Transactional(readOnly = false)
+	public void updateSpecificTime(ConstructionProject constructionProject,Date historyTime){
+		String status = TreeTableUtil.getConstructionId(constructionProject);
+		if ("".equals(status)){
+			constructionProject.preUpdate();
+			constructionProjectMapper.updateSpecificTime(constructionProject);
+		}
+		if ("line".equals(status)){
+			Date specificTime = constructionProject.getSpecificTime();
+			constructionProject.setId("");
+			constructionProject.setArrangeTime(null);
+			List<ConstructionProject> list = findList(constructionProject);
+			for (ConstructionProject constructionProject1:list){
+				constructionProject1.preUpdate();
+				constructionProject1.setSpecificTime(specificTime);
+			}
+			constructionProjectMapper.updateSpecificLine(list);
+		}
+	}
 
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -523,9 +523,12 @@ public  class ProExcelInfo {
     }
 
     public static String getJudgeRole(User user){
+        if (user.getRoleList().size()>1){
+            return "3";
+        }
         //如果是项目经理导入的
         if ("项目经理".equals(user.getRoleList().get(0).getName())){
-            return "1";
+           return "1";
         }
         if ("配网工程专职".equals(user.getRoleList().get(0).getName())){
             return "0";

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -195,6 +195,8 @@ public class ProjectController extends BaseController {
 		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
 		if ("0".equals(judgeRole)){
 			return "modules/sg/managementcenter/project/projectForm";
+		}else if ("3".equals(judgeRole)){
+			return "modules/sg/managementcenter/project/projectForm3";
 		}else {
 			return "modules/sg/managementcenter/project/projectForm2";
 		}
@@ -230,7 +232,7 @@ public class ProjectController extends BaseController {
 		}
 		String loginName = UserUtils.getUser().getLoginName();
 		List<String> allUser = projectService.findAllUser();
-		if ("0".equals(judgeRole)){
+		if ("0".equals(judgeRole)||"3".equals(judgeRole)){
 			String judgeValue = ProExcelInfo.getJudgeValue(projects,allUser);
 			if (project.getIsNewRecord()){
 				if (!"".equals(judgeValue)||!project.getDistributionEngineering().equals(loginName)){
@@ -379,7 +381,7 @@ public class ProjectController extends BaseController {
 		User userByLoginName = systemService.getUserByLoginName(UserUtils.getUser().getLoginName());
 		String judgeRole = ProExcelInfo.getJudgeRole(userByLoginName);
 		if (judgeRole.equals("2")){
-			j.setSuccess(false);
+			j.setSuccess(true);
 			j.setMsg("导入失败：您还没有导入的权限，如果需要请联系管理员!");
 			return j;
 		}
@@ -392,6 +394,9 @@ public class ProjectController extends BaseController {
 				j.setMsg("导入失败：表不符合规范,请修改后再导入");
 				return j;
 			}
+			if (judgeRole.equals("3")){
+				return getProject(j,importUtil);
+			}
 			if (judgeRole.equals("0")){
 				List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtilDistribution(importUtil));
 				List<String> users = projectService.findAllUser();
@@ -444,6 +449,46 @@ public class ProjectController extends BaseController {
 		return j;
     }
 
+	public AjaxJson getProject(AjaxJson j,ImportUtil importUtil){
+		List<Project> projects =ProExcelInfo.getSureProjects(ProExcelInfo.getProjectUtilDistribution(importUtil));
+		List<String> users = projectService.findAllUser();
+		String judgeValue = ProExcelInfo.getJudgeValue(projects,users);
+		if (!"".equals(judgeValue)){
+			j.setSuccess(false);
+			j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
+			return j;
+		}
+		if (null==projects||projects.size()<=0){
+			j.setSuccess(false);
+			j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
+			return j;
+		}
+		projectService.saveList(projects);
+
+		//得到项目经理操作的集合
+		List<Project> projectsManager =ProExcelInfo.getSureProjectsManager(ProExcelInfo.getProjectUtilProjectManager(importUtil));
+		if(null==projectsManager||projectsManager.size()<=0){
+			j.setSuccess(false);
+			j.setMsg("导入失败:无符合数据,请检查后再重新导入.");
+			return j;
+		}
+		//根据项目名称去查找数据库中集合
+		List<Project> projectList = projectService.getListProject(projectsManager);
+		//得到可以导入数据库中集合
+		List<Project> sureManagerProject = ProExcelInfo.getSureManagerProject(projectsManager, projectList);
+		String judgeValue1 = ProExcelInfo.getJudgeValueManager(sureManagerProject);
+		if (!"".equals(judgeValue1)){
+			j.setSuccess(false);
+			j.setMsg("导入失败："+judgeValue+"数据不符合规范！");
+			return j;
+		}
+		if (null!=sureManagerProject && sureManagerProject.size()>0){
+			projectService.saveListManager(sureManagerProject,projectList);
+			j.setMsg( "已成功导入 "+sureManagerProject.size()+" 条项目表单记录");
+		}
+		return j;
+	}
+
 
 //	/**
 //	 * 导入Excel数据

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm3.jsp

@@ -0,0 +1,319 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>需求基本信息</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+	        $('#beginDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+	        $('#endDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+		});
+		function save() {
+            var isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+			}else{
+                jp.loading();
+                jp.post("${ctx}/sg/managementcenter/project/save",$('#inputForm').serialize(),function(data){
+                    if(data.success){
+                        jp.getParent().refresh();
+                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(dialogIndex);
+                        jp.success(data.msg)
+
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+			}
+
+        }
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm" modelAttribute="project" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+			<tbody>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>项目需求名称：</label></td>
+					<td class="width-35">
+						<form:input path="requireName"   htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">工程编号：</label></td>
+					<td class="width-35">
+						<form:input path="projectId"   htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">项目名称：</label></td>
+					<td class="width-35">
+						<form:input path="projectName"  htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目定义号：</label></td>
+					<td class="width-35">
+						<form:input path="projectNumber"  htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>类型：</label></td>
+					<td class="width-35">
+						<form:input path="type"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>需求提出单位：</label></td>
+					<td class="width-35">
+						<form:input path="demandUnit"  htmlEscape="false"   class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">变电站名称：</label></td>
+					<td class="width-35">
+						<form:input path="bdzName"  htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">线路名称：</label></td>
+					<td class="width-35">
+						<form:input path="lineName"  htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>项目经理角色：</label></td>
+					<td class="width-35">
+						<form:input path="projectManageRole"  disabled="disabled" htmlEscape="false" class="form-control required "/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>配网工程专职角色：</label></td>
+					<td class="width-35">
+						<form:input path="distributionEngineering"  htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>配网物资专职角色：</label></td>
+					<td class="width-35">
+						<form:input path="distributionMaterials"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>配网系统专职角色：</label></td>
+					<td class="width-35">
+						<form:input path="distributionSystem"  htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>配网政策处理专职：</label></td>
+					<td class="width-35">
+						<form:input path="distributionPolicy"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>项目管理中心领导角色：</label></td>
+					<td class="width-35">
+						<form:input path="managementLeader"  htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位：</label></td>
+					<td class="width-35">
+						<form:input path="runUnit"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>运行单位角色：</label></td>
+					<td class="width-35">
+						<form:input path="runUnitRole" htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>经研所角色：</label></td>
+					<td class="width-35">
+						<form:input path="throughResearchRole"   htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位：</label></td>
+					<td class="width-35">
+						<form:input path="constructionUnit"  htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位角色：</label></td>
+					<td class="width-35">
+						<form:input path="constructionUnitRole"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位项目经理：</label></td>
+					<td class="width-35">
+						<form:input path="constructionUnitManage"  htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>施工单位领导：</label></td>
+					<td class="width-35">
+						<form:input path="constructionUnitLeader"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位：</label></td>
+					<td class="width-35">
+						<form:input path="designUnit" htmlEscape="false"  class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位项目经理：</label></td>
+					<td class="width-35">
+						<form:input path="designUnitManage" htmlEscape="false"  class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>设计单位领导：</label></td>
+					<td class="width-35">
+						<form:input path="designUnitLeader"  htmlEscape="false" class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>交底类型：</label></td>
+					<td class="width-35">
+						<form:input path="clarificaitonType"  htmlEscape="false" class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">建设理由分类：</label></td>
+					<td class="width-35">
+						<form:input path="bulidClassificationResons" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">建设理由：</label></td>
+					<td class="width-35">
+						<form:textarea path="bulbidResons"  htmlEscape="false" rows="4"    class="form-control "/>
+					</td>
+					<td class="width-15 active"><label class="">设备基本情况：</label></td>
+					<td class="width-35">
+						<form:input path="asicEquipment"  htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">运行班：</label></td>
+					<td class="width-35">
+						<form:input path="runTheClass"  htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">项目组：</label></td>
+					<td class="width-35">
+						<form:input path="projectTeam"  htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">费用估算：</label></td>
+					<td class="width-35">
+						<form:input path="costEstimate"  htmlEscape="false"    class="form-control number"/>
+					</td>
+					<td class="width-15 active"><label class="">是否迎风期度夏项目：</label></td>
+					<td class="width-35">
+						<form:input path="whetherRheUpwind"   htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">确定下达时间：</label></td>
+					<td class="width-35">
+						<form:input path="sureDaDate"  htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class="">备注：</label></td>
+					<td class="width-35">
+						<form:textarea path="textRemark"  htmlEscape="false" rows="4"    class="form-control "/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="">停电线路：</label></td>
+					<td class="width-35">
+						<form:input path="powerLine" htmlEscape="false"    class="form-control"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
+					<td class="width-35">
+						<form:input path="powerScope" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>项目类型：</label></td>
+					<td class="width-35">
+						<form:input path="projectType" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否为停电打包项目：</label></td>
+					<td class="width-35">
+						<form:input path="powerFlagPackage" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>政处初步判断：</label></td>
+					<td class="width-35">
+						<form:input path="preliminaryJudgment" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含土建（不含钢管杆）：</label></td>
+					<td class="width-35">
+						<form:input path="flagCivilEngineering" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>钢管杆基础类型：</label></td>
+					<td class="width-35">
+						<form:input path="steelTubePole" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否需要规矩报批：</label></td>
+					<td class="width-35">
+						<form:input path="flagApprovalPlanning" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>设备改造类型：</label></td>
+					<td class="width-35">
+						<form:input path="equCreateType" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">改造设备尺寸及间隔数：</label></td>
+					<td class="width-35">
+						<form:input path="equCreateSize" htmlEscape="false" class="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否新设备命名：</label></td>
+					<td class="width-35">
+						<form:input path="flagNewEquName" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含变电站新间格投运：</label></td>
+					<td class="width-35">
+						<form:input path="includeBdzNews" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否非涉电电气施工：</label></td>
+					<td class="width-35">
+						<form:input path="flagNoElectrical" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>图纸标注的带点作业情况：</label></td>
+					<td class="width-35">
+						<form:input path="drawingsWork" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>是否含自动化：</label></td>
+					<td class="width-35">
+						<form:input path="flagAutomation" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>二遥或三摇：</label></td>
+					<td class="width-35">
+						<form:input path="twoAndThreeRemote" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>通讯方式：</label></td>
+					<td class="width-35">
+						<form:input path="phoneStyle" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class=""><font color="red">*</font>柱开集中或就业地：</label></td>
+					<td class="width-35">
+						<form:input path="stayOpenArea" htmlEscape="false"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class=""><font color="red">*</font>环网柜：</label></td>
+					<td class="width-35">
+						<form:input path="ringNetworkCabinet" htmlEscape="false"    class="form-control required"/>
+					</td>
+					<td class="width-15 active"><label class="">站房dtu：</label></td>
+					<td class="width-35">
+						<form:input path="stationDtu" htmlEscape="false"    class="form-control"/>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</form:form>
+</body>
+</html>