项目管理-项目类型模块树状图信息

src/main/java/com/jeeplus/modules/projectType/dao/ProjectTypeDao.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="http://www.rhcncpa.com/">瑞华会计师事务所</a> All rights reserved.
+ */
+package com.jeeplus.modules.projectType.dao;
+
+import com.jeeplus.common.persistence.CrudDao;
+import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.projectType.entity.ProjectType;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData;
+import com.jeeplus.modules.sys.entity.Menu;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.workcontent.entity.WorkContentCompanyType;
+import com.jeeplus.modules.workcontent.entity.WorkContentType;
+
+import java.util.List;
+
+/**
+ * 项目类型DAO接口
+ * @author 徐滕
+ * @version 2020-07-03
+ */
+@MyBatisDao
+public interface ProjectTypeDao extends CrudDao<ProjectType> {
+	List<ProjectType> findProjectList(ProjectType projectType);
+
+	/**
+	 * 获取最新的一个父节点id
+	 * @return
+	 */
+	String getNewParentId();
+
+	/**
+	 * 获取最新的一个id
+	 * @return
+	 */
+	String getNewId();
+
+	/**
+	 * 获取最新的一个type_id
+	 * @return
+	 */
+	String getNewTypeId(String parentId);
+
+	int updateTypeId(ProjectType projectType);
+
+	List<ProjectReportTreeData> getProjectTypeList(ProjectType projectType);
+
+	Integer deleteProjectTypeById(String id);
+
+}

src/main/java/com/jeeplus/modules/projectType/entity/ProjectType.java

@@ -0,0 +1,99 @@
+package com.jeeplus.modules.projectType.entity;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jeeplus.common.persistence.DataEntity;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 项目类型entity
+ * @author 徐滕
+ * @version 2020-07-03
+ */
+public class ProjectType extends DataEntity<ProjectType> {
+    private static final long serialVersionUID = 1L;
+    private String parentId;	// 父级ID
+    private String parentIds; // 所有父级编号
+    private String typeName; 	// 类型名称
+    private String parentName;  //父级名称
+    private String typeId;   //类型id
+
+
+    private String createId;//创建者id
+    private String view;
+
+    @JsonIgnore
+    public static String getRootId(){
+        return "1";
+    }
+
+    public ProjectType(){
+        super();
+    }
+
+    public ProjectType(String id){
+        super(id);
+    }
+
+    @JsonBackReference
+    @NotNull
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    @Length(min=1, max=2000)
+    public String getParentIds() {
+        return parentIds;
+    }
+
+    public void setParentIds(String parentIds) {
+        this.parentIds = parentIds;
+    }
+
+    @Length(min=1, max=100)
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
+
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getView() {
+        return view;
+    }
+
+    public void setView(String view) {
+        this.view = view;
+    }
+}

src/main/java/com/jeeplus/modules/projectType/service/ProjectTypeService.java

@@ -0,0 +1,90 @@
+package com.jeeplus.modules.projectType.service;
+
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.projectType.dao.ProjectTypeDao;
+import com.jeeplus.modules.projectType.entity.ProjectType;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData;
+import org.aspectj.apache.bcel.generic.RET;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 项目类型service
+ * @author 徐滕
+ * @version 2020-07-03
+ */
+@Service
+@Transactional(readOnly = true)
+public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType> {
+    @Autowired
+    private ProjectTypeDao projectTypeDao;
+
+    public ProjectType getProjectType(String id) {
+        return projectTypeDao.get(id);
+    }
+
+    @Transactional(readOnly = false)
+    public List<ProjectType> findList(ProjectType projectType) {
+        List<ProjectType> list = super.findList(projectType);
+        return list;
+    }
+
+    @Transactional(readOnly = false)
+    public List<ProjectReportTreeData> getProjectTypeList(String typeName) {
+        ProjectType projectType = new ProjectType();
+        projectType.setTypeName(typeName);
+        List<ProjectReportTreeData> list = dao.getProjectTypeList(projectType);
+        return list;
+    }
+    /*@Transactional(readOnly = false)
+    public List<ProjectType> findProjectList(ProjectType projectType) {
+        List<ProjectType> list = dao.findProjectList(projectType);
+        return list;
+    }*/
+    public Page<ProjectType> findPage(Page<ProjectType> page, ProjectType projectType) {
+        return super.findPage(page, projectType);
+    }
+
+    @Transactional(readOnly = false)
+    public void save(ProjectType projectType) {
+        if(StringUtils.isBlank(projectType.getParentId())){
+            String newIdStr = dao.getNewParentId();
+            Integer newIdInt = null;
+            if(StringUtils.isNotBlank(newIdStr)){
+                newIdInt = Integer.valueOf(newIdStr)+1;
+            }
+            projectType.preInsert();
+            projectType.setId(newIdInt.toString());
+            projectType.setParentId("0");
+            projectType.setParentIds("0");
+            dao.insert(projectType);
+            dao.updateTypeId(projectType);
+        }else{
+            projectType.setParentIds("0,"+projectType.getParentId());
+            if(StringUtils.isNotBlank(projectType.getId())){
+                projectType.preUpdate();
+                dao.update(projectType);
+            }else{
+                projectType.preInsert();
+                dao.insert(projectType);
+            }
+
+        }
+    }
+
+    @Transactional(readOnly = false)
+    public Integer deleteProjectTypeById(ProjectType projectType) {
+        Integer result = dao.deleteProjectTypeById(projectType.getId());
+        return result;
+    }
+
+    @Transactional(readOnly = false)
+    public void deleteByLogic(ProjectType projectType) {
+        dao.deleteByLogic(projectType);
+    }
+}

src/main/java/com/jeeplus/modules/projectType/web/ProjectTypeController.java

@@ -0,0 +1,180 @@
+package com.jeeplus.modules.projectType.web;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectType.entity.ProjectType;
+import com.jeeplus.modules.projectType.service.ProjectTypeService;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData;
+import com.jeeplus.modules.sys.entity.Menu;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.service.SystemService;
+import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workcontent.entity.WorkContentType;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目类型Controller
+ * @author 徐滕
+ * @version 2020-07-03
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/projectType/projectType")
+public class ProjectTypeController extends BaseController {
+
+	@Autowired
+	private ProjectTypeService projectTypeService;
+
+	@ModelAttribute
+	public ProjectType get(@RequestParam(required=false) String id) {
+		ProjectType entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = projectTypeService.getProjectType(id);
+		}
+		if (entity == null){
+			entity = new ProjectType();
+		}
+		return entity;
+	}
+
+	/**
+	 * 工作内容类型列表页面
+	 */
+	@RequiresPermissions("project:projectType:list")
+	@RequestMapping(value = {"list", ""})
+	public String list(ProjectType projectType, Model model) {
+		/*List<ProjectType> list = projectTypeService.findList(projectType);
+		model.addAttribute("list", list);*/
+		return "modules/project/type/projectTypeList";
+	}
+
+	/**
+	 * 根据项目id查询工作内容信息Tree
+	 * @param typeName
+	 * @return
+	 */
+	@RequestMapping("getProjectTypeTreeList")
+	@ResponseBody
+	public Map<String,List> getProjectTypeTreeList(String typeName){
+		Map<String,List> map = new HashMap<>();
+		//获取成果列表父节点
+		List<ProjectReportTreeData> parentReportDataList = projectTypeService.getProjectTypeList(typeName);
+		for (ProjectReportTreeData reportData : parentReportDataList) {
+			//添加登陆者id
+			reportData.setLoginUserId(UserUtils.getUser().getId());
+		}
+		map.put("data",parentReportDataList);
+		return map;
+	}
+
+	/**
+	 * 查看，增加，编辑工作内容类型表单页面
+	 */
+	@RequiresPermissions(value={"project:projectType:view","project:projectType:add","project:projectType:edit"},logical=Logical.OR)
+	@RequestMapping(value = "form")
+	public String form(ProjectType projectType, Model model) {
+		if(StringUtils.isNotBlank(projectType.getView())){
+			if("view".equals(projectType.getView())){
+				return "modules/project/type/projectTypeView";
+			}else if("saveSubordinateInfo".equals(projectType.getView())){
+				projectType.setParentName(projectType.getTypeName());
+				projectType.setParentId(projectType.getId());
+				projectType.setTypeName("");
+				projectType.setRemarks("");
+				projectType.setId("");
+			}else if("updateSubordinateInfo".equals(projectType.getView())){
+
+			}
+		}
+		model.addAttribute("projectType", projectType);
+		if("updateSubordinateInfo".equals(projectType.getView()) || "saveSubordinateInfo".equals(projectType.getView())){
+			return "modules/project/type/projectTypeFormSubordinate";
+		}
+		return "modules/project/type/projectTypeForm";
+	}
+
+	/**
+	 * 保存工作内容类型
+	 */
+	@RequiresPermissions(value={"project:projectType:add","project:projectType:edit"},logical=Logical.OR)
+	@RequestMapping(value = "save")
+	public String saveParentInfo(ProjectType projectType, Model model, RedirectAttributes redirectAttributes) throws Exception{
+
+		if (!beanValidator(model, projectType)){
+			return form(projectType, model);
+		}
+		if(!projectType.getIsNewRecord()){//编辑表单保存
+			ProjectType t = projectTypeService.get(projectType.getId());//从数据库取出记录的值
+			MyBeanUtils.copyBeanNotNull2Bean(projectType, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			projectTypeService.save(t);//保存
+		}else{//新增表单保存
+			projectTypeService.save(projectType);//保存
+		}
+		addMessage(redirectAttributes, "保存工作内容类型成功");
+		return "redirect:"+Global.getAdminPath()+"/projectType/projectType/?repage";
+	}
+
+	/**
+	 * 保存工作内容类型
+	 */
+	@RequestMapping(value = "saveSubordinateInfo")
+	@ResponseBody
+	public Map<String,Object> saveSubordinateInfo(ProjectType projectType, Model model, RedirectAttributes redirectAttributes) throws Exception{
+		Map<String,Object> map = new HashMap<>();
+		if (!beanValidator(model, projectType)){
+			map.put("code",0);
+			map.put("msg","数据错误");
+			return map;
+		}
+		if(!projectType.getIsNewRecord()){//编辑表单保存
+			ProjectType t = projectTypeService.get(projectType.getId());//从数据库取出记录的值
+			MyBeanUtils.copyBeanNotNull2Bean(projectType, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+			projectTypeService.save(t);//保存
+		}else{//新增表单保存
+			projectTypeService.save(projectType);//保存
+		}
+		addMessage(redirectAttributes, "保存工作内容类型成功");
+		map.put("code",1);
+		map.put("msg","操作成功");
+		return map;
+	}
+
+	/**
+	 * 删除工作内容类型
+	 */
+	@RequiresPermissions("project:projectType:remove")
+	@RequestMapping(value = "delete")
+	@ResponseBody
+	public Map<String,Object> delete(ProjectType projectType, RedirectAttributes redirectAttributes) {
+		Map<String,Object> map = new HashMap<>();
+		Integer result = projectTypeService.deleteProjectTypeById(projectType);
+		if (result ==1){
+			addMessage(redirectAttributes, "删除工作内容类型成功");
+			map.put("code",1);
+		}else{
+			addMessage(redirectAttributes, "删除工作内容类型失败");
+			map.put("code",0);
+		}
+		return map;
+	}
+}

src/main/resources/mappings/modules/projectType/ProjectTypeDao.xml

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.projectType.dao.ProjectTypeDao">
+
+	<sql id="projectTypeColumns">
+		a.id,
+		a.parent_id AS "parentId",
+		a.parent_ids as parentIds,
+		a.type_name as "typeName",
+		a.type_id as "typeId",
+		a.remarks,
+		a.create_by AS "createBy.id",
+		a.create_date,
+		a.update_by AS "updateBy.id",
+		a.update_date,
+		a.del_flag
+	</sql>
+
+
+	<select id="get" resultType="com.jeeplus.modules.projectType.entity.ProjectType" >
+		SELECT
+		<include refid="projectTypeColumns"/>
+		,p.type_name as "parentName"
+		FROM project_type a
+		left join project_type p on p.id = a.parent_id
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="com.jeeplus.modules.projectType.entity.ProjectType" >
+		SELECT DISTINCT
+		<include refid="projectTypeColumns"/>
+		,p.type_name as "parentName"
+		FROM project_type a
+		left join project_type p on p.id = a.parent_id
+		<where>
+			a.del_flag = '0'
+			<if test="typeName != null and typeName != ''">
+				AND (a.type_name LIKE concat('%',#{typeName},'%') OR a.parent_id ='0')
+			</if>
+			<if test="parentId !=null and parentId !=''">
+				AND a.parent_id = #{parentId}
+			</if>
+		</where>
+		<choose>
+			<otherwise>
+				ORDER BY a.parent_id, a.type_id
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="getProjectTypeList" resultType="com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData" >
+		select a.id as "id",
+		a.create_date as "createDate",a.create_by as "createId",
+		 a.type_name as "name",a.parent_id as "pid"
+		from project_type a
+		<where>
+			a.del_flag = 0
+			<if test="typeName != null and typeName != ''">
+				AND (a.type_name LIKE concat('%',#{typeName},'%') OR a.parent_id ='0')
+			</if>
+		</where>
+		order by a.update_date desc
+	</select>
+
+	<select id="findProjectList" resultType="com.jeeplus.modules.projectType.entity.ProjectType" >
+		SELECT DISTINCT
+		<include refid="projectTypeColumns"/>
+		FROM project_type a
+		<where>
+			AND a.parent_id = #{parentId}
+		</where>
+		<choose>
+			<otherwise>
+				ORDER BY a.parent_id, a.type_id
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="getNewParentId" resultType="java.lang.String" >
+		select id from project_type where parent_id = '0' order by create_date desc limit 0,1
+	</select>
+
+	<select id="getNewId" resultType="java.lang.String" >
+		select id from project_type order by id desc limit 0,1
+	</select>
+
+	<select id="getNewTypeId" resultType="java.lang.String" >
+		select type_id as typeId from project_type where parent_id = #{parentId} order by create_date desc limit 0,1
+	</select>
+
+	<update id="updateTypeId">
+		update project_type set type_id = #{id} where id = #{id}
+	</update>
+
+	<insert id="insert">
+		INSERT INTO project_type(
+			id,
+			parent_id,
+			parent_ids,
+			type_name,
+			type_id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{parentId},
+			#{parentIds},
+			#{typeName},
+			#{typeId},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+
+	<update id="update">
+		UPDATE project_type SET
+			parent_id = #{parentId},
+			parent_ids = #{parentIds},
+			type_name = #{typeName},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM project_type
+		WHERE id = #{id}
+	</update>
+
+	<delete id="deleteProjectTypeById">
+		DELETE FROM project_type
+		WHERE id = #{id}
+	</delete>
+
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE project_type SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+
+	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
+	<select id="findUniqueByProperty" resultType="com.jeeplus.modules.projectType.entity.ProjectType" statementType="STATEMENT">
+		select * FROM project_type  where ${propertyName} = '${value}'
+	</select>
+</mapper>

src/main/webapp/webpage/modules/project/type/projectTypeForm.jsp

@@ -0,0 +1,62 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>工作内容类型管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				$("#inputForm").submit();
+				return true;
+			}
+
+			return false;
+		}
+		$(document).ready(function() {
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectType" action="${ctx}/projectType/projectType/save" method="post" class="form-horizontal">
+			<form:hidden path="id"/>
+			<input type="hidden" name="parentId" value="${projectType.parentId}">
+			<sys:message content="${message}"/>
+			<div class="form-group layui-row first lw9">
+				<div class="form-group-label"><h2>基础信息</h2></div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">父级节点：</label>
+					<div class="layui-input-block">
+						<form:input path="parentName" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">项目类型名称：</label>
+					<div class="layui-input-block">
+						<form:input path="typeName" htmlEscape="false" class="form-control layui-input"/>
+					</div>
+				</div>
+			</div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/project/type/projectTypeFormSubordinate.jsp

@@ -0,0 +1,62 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>工作内容类型管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				$("#inputForm").submit();
+				return true;
+			}
+
+			return false;
+		}
+		$(document).ready(function() {
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectType" action="${ctx}/projectType/projectType/saveSubordinateInfo" method="post" class="form-horizontal">
+			<form:hidden path="id"/>
+			<input type="hidden" name="parentId" value="${projectType.parentId}">
+			<sys:message content="${message}"/>
+			<div class="form-group layui-row first lw9">
+				<div class="form-group-label"><h2>基础信息</h2></div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">父级节点：</label>
+					<div class="layui-input-block">
+						<form:input path="parentName" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">项目类型名称：</label>
+					<div class="layui-input-block">
+						<form:input path="typeName" htmlEscape="false" class="form-control layui-input"/>
+					</div>
+				</div>
+			</div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/project/type/projectTypeList.jsp

@@ -0,0 +1,376 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>工作内容类型管理</title>
+	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("#treeTable").treeTable({expandLevel : 5},{ expandable: true });
+		});
+	</script>
+	<style>
+		body{
+			background-color:transparent;
+			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
+			color:#ffffff;
+			background-color:rgba(255,255,255,0);
+			height:100%;
+		}
+	</style>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<sys:message content="${message}"/>
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="contentShadow layui-row" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="projectType" action="${ctx}/projectType/projectType/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+					<div class="commonQuery lw9">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">项目类型名称：</label>
+							<div class="layui-input-block">
+								<form:input path="typeName" htmlEscape="false" class=" form-control layui-input"></form:input>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<button id="searchReset" style="margin-right: 0px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="contentShadow layui-form contentDetails">
+				<div class="nav-btns">
+					<shiro:hasPermission name="project:projectType:add">
+						<table:addRow url="${ctx}/projectType/projectType/form" title="项目内容类型"></table:addRow><!-- 增加按钮 -->
+					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectType:import">
+						<table:importExcel url="${ctx}/projectType/projectType/import"></table:importExcel><!-- 导入按钮 -->
+					</shiro:hasPermission>
+					<shiro:hasPermission name="project:projectType:export">
+						<table:exportExcel url="${ctx}/projectType/projectType/export"></table:exportExcel><!-- 导出按钮 -->
+					</shiro:hasPermission>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+
+					<table id="achievementTable" class="layui-table" lay-filter="achievementTable"></table>
+
+				<!-- 表格 -->
+				<%--<table id="treeTable" class="table table-bordered table-hover list-table">
+					<thead>
+					<tr>
+						<th width="50%">项目类型名称</th>
+						<th width="20%">创建时间</th>
+						<th width="30%">操作</th>
+					</tr>
+					</thead>
+					<tbody>
+					<c:forEach items="${list}" var="projectType">
+						<tr  id="${projectType.id}" pId="${projectType.parentId}">
+							<td><a  href="#" onclick="openDialogView('查看工作内容类型', '${ctx}/projectType/projectType/form?id=${projectType.id}','95%', '95%')">
+									${projectType.typeName}</a>
+							</td>
+							<td style="text-align: center">
+								<fmt:formatDate value="${projectType.createDate}" pattern="yyyy-MM-dd"/>
+							</td>
+							<td class="op-td text-center">
+								<div class="op-btn-box">
+									<shiro:hasPermission name="project:projectType:view">
+										<a href="#" onclick="openDialogView('查看项目类型信息', '${ctx}/projectType/projectType/form?view=view&id=${projectType.id}','80%', '80%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+									</shiro:hasPermission>
+									<shiro:hasPermission name="project:projectType:add">
+										<a href="#" onclick="openDialog('新增项目类型信息', '${ctx}/projectType/projectType/form?view=save&id=${projectType.id}','80%', '80%')" class="op-btn nav-btn-add layui-bg-green" ><i class="fa fa-plus layui-bg-green"></i> 新增下级类型</a>
+									</shiro:hasPermission>
+									<shiro:hasPermission name="project:projectType:edit">
+										<a href="#" onclick="openDialog('修改项目类型信息', '${ctx}/projectType/projectType/form?view=edit&id=${projectType.id}','80%','80%')" class="btn btn-success btn-xs" ><i class="fa fa-edit"></i> 修改</a>
+									</shiro:hasPermission>
+									<shiro:hasPermission name="project:projectType:remove">
+										<a href="${ctx}/projectType/projectType/delete?id=${projectType.id}&delFlag=${projectType.delFlag}" onclick="return confirmx('确认要删除该项目类型吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+									</shiro:hasPermission>
+								</div>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>--%>
+
+				<!-- 分页代码 -->
+			</div>
+		</div>
+	</div>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+
+<script>
+	/*使用模块加载的方式 加载文件*/
+	layui.config({
+		base: '${ctx}/resoueces/css/layui/module/'
+	}).extend({
+		treetable: 'treetable-lay/treetable'
+	}).use(['layer', 'table', 'treetable'], function () {
+		var $ = layui.jquery;
+		var table = layui.table;
+		var layer = layui.layer;
+		var treetable = layui.treetable;
+
+		// 渲染表格
+		var renderTable = function () {
+			layer.load(2);
+			treetable.render({
+				treeColIndex: 1,//树形图标显示在第几列
+				treeSpid: 0,//最上级的父级id
+				treeIdName: 'permissionId',//id字段的名称
+				treePidName: 'pid',//pid字段的名称
+				treeDefaultClose: false,//是否默认折叠
+				treeLinkage: true,//父级展开时是否自动展开所有子级
+				elem: '#achievementTable',
+				url: '${ctx}/projectType/projectType/getProjectTypeTreeList?typeName=',
+				page: false,
+				cols: [[
+					{type: 'numbers', title: '序号' ,width:80},
+					{field: 'name', title: '类型',templet:function(d){
+							if(null != d.name){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目类型信息', '${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%')\">" + d.name + "</a>";
+							}else{
+								return "";
+							}
+						}},
+					{field: 'name', title: '项目类型名称',templet:function(d){
+							if(null != d.name){
+								return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目类型信息', '${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%')\">" + d.name + "</a>";
+							}else{
+								return "";
+							}
+						}},
+					{field: 'createDate', title: '创建时间',width:80},
+					{templet: complain, title: '操作'}
+				]],
+				done: function () {
+					layer.closeAll('loading');
+				}
+			});
+		};
+
+		renderTable();
+
+		//触发三个button按钮
+		$('#btn-expand').click(function () {
+			treetable.expandAll('#permissionTable');
+		});
+
+		$('#btn-fold').click(function () {
+			treetable.foldAll('#permissionTable');
+		});
+
+		$('#btn-refresh').click(function () {
+			renderTable();
+		});
+
+
+		function complain(d){//操作中显示的内容
+			return [
+				"<a href=\"javascript:void(0)\" onclick=\"openProjectTypeView('查看项目类型信息','${ctx}/projectType/projectType/form?view=view&id="+d.id+"','95%', '95%');\" class=\"op-btn op-btn-view\"><i class=\"fa fa-search-plus\"></i> 查看</a>",
+				"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增项目类型信息','${ctx}/projectType/projectType/form?view=saveSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green\"><i class=\"fa fa-plus layui-bg-green\"></i> 新增下级项目类型</a>",
+				"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/projectType/projectType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 修改</a>",
+				'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+			].join('');
+			<%--<shiro:hasPermission name="project:projectType:add">
+			<a href="#" onclick="openDialog('新增项目类型信息', '${ctx}/projectType/projectType/form?view=save&id=${projectType.id}','80%', '80%')" class="op-btn nav-btn-add layui-bg-green" ><i class="fa fa-plus layui-bg-green"></i> 新增下级类型</a>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="project:projectType:edit">
+			<a href="#" onclick="openDialog('修改项目类型信息', '${ctx}/projectType/projectType/form?view=edit&id=${projectType.id}','80%','80%')" class="btn btn-success btn-xs" ><i class="fa fa-edit"></i> 修改</a>
+			</shiro:hasPermission>
+			<shiro:hasPermission name="project:projectType:remove">
+			<a href="${ctx}/projectType/projectType/delete?id=${projectType.id}&delFlag=${projectType.delFlag}" onclick="return confirmx('确认要删除该项目类型吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+			</shiro:hasPermission>--%>
+			/*if(d.loginUserId == d.createBy){
+				if(d.fileStatus == 1){
+					return [
+						'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&dictType=${dictType}&id=${id}&parentIds=${parentIds}&projectReportData.id='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id=${id}&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+					].join('');
+				}else if(d.fileStatus == 2){
+					return [
+						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.id+'&id=${id}&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+					].join('');
+				}else if(d.fileStatus == 3){
+					return [
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&dictType=${dictType}&id=${id}&parentIds=${parentIds}&projectReportData.id='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id=${id}&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+					].join('');
+				}else if(d.fileStatus == 4){
+					return [
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&dictType=${dictType}&id=${id}&parentIds=${parentIds}&projectReportData.id='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
+						'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id=${id}&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+					].join('');
+				}else if(d.fileStatus == 5){
+					return [
+						'<a href="javascript:void(0)" onclick="openDialogres(\'报告作废\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportInvalid&dictType=${dictType}&id=${id}&parentIds=${parentIds}&projectReportData.id='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-invalid" ><i class="fa fa-trash-o"></i> 作废</a>',
+					].join('');
+				}else{
+					return[''].join('');
+				}
+			}else{
+				return[''].join('');
+			}*/
+		}
+		//监听工具条
+		table.on('tool(permissionTable)', function (obj) {
+			var data = obj.data;
+			var layEvent = obj.event;
+			if(data.permissionName!=null){
+				if (layEvent === 'del') {
+					layer.msg('删除' + data.id);
+				} else if (layEvent === 'edit') {
+					layer.msg('修改' + data.id);
+				}
+			}
+		});
+	});
+</script>
+<script>
+	function openProjectTypeView(title,url,width,height,target){
+		var company=$("#company").val();
+		url=url+"&company="+company;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			skin:"two-btns",
+			btn: ['关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				top.layer.close(index);
+				//formSubmit($document,"inputForm",index);
+			},
+			cancel: function(index){
+			}
+		});
+
+	}
+
+	function openProjectType(title,url,width,height,target){
+		var company=$("#company").val();
+		url=url+"&company="+company;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			content: url ,
+			skin:"two-btns",
+			btn: ['提交','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				formSubmit($document,"inputForm",index);
+			},
+			cancel: function(index){
+			}
+		});
+
+	}
+	function formSubmit($document,inputForm,index){
+		$($document.getElementById(inputForm)).ajaxSubmit({
+			success:function(data) {
+				top.layer.close(index);
+				/*if(data.status){
+					parent.layer.msg('删除成功',{icon:1});
+					window.location.reload();
+				}else {
+					parent.layer.msg('删除失败',{icon:2});
+				}*/
+				if(data.code == 0){
+					layer.msg(data.msg, {icon: 1,time: 1000}, function(){
+						return false;
+					});
+				}else{
+					layer.msg(data.msg, {icon: 1,time: 1000}, function(){
+						window.location.reload();
+					});
+				}
+			},error:function(){
+				layer.msg("操作失败",{icon:2});
+				window.location.reload();
+			}
+		});
+	}
+	// 确认对话框
+	function confirmxRefresh(mess, href){
+		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+			//do something
+			if (typeof href == 'function') {
+				href();
+			}else{
+				resetTip(); //loading();
+				$.ajax({
+					url:href,
+					data:$('#loginForm').serialize(),
+					type:"post",
+					success:function(data){
+						if(data.code == 1){
+							parent.layer.msg('删除成功',{icon:1});
+							window.location.reload();
+						}else {
+							parent.layer.msg('删除失败',{icon:2});
+						}
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/project/type/projectTypeView.jsp

@@ -0,0 +1,62 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>工作内容类型管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				$("#inputForm").submit();
+				return true;
+			}
+
+			return false;
+		}
+		$(document).ready(function() {
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectType" action="${ctx}/projectType/projectType/save" method="post" class="form-horizontal">
+			<form:hidden path="id"/>
+			<input type="hidden" name="parentId" value="${projectType.parentId}">
+			<sys:message content="${message}"/>
+			<div class="form-group layui-row first lw9">
+				<div class="form-group-label"><h2>基础信息</h2></div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">父级节点：</label>
+					<div class="layui-input-block">
+						<form:input path="parentName" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">项目类型名称：</label>
+					<div class="layui-input-block">
+						<form:input path="typeName" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+					</div>
+				</div>
+			</div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>