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

@@ -79,4 +79,17 @@ public interface ProjectTypeDao extends CrudDao<ProjectType> {
 	 * @return
 	 */
 	ProjectBasedData getBasedData(@Param("contentId")String contentId,@Param("basedId")String basedId);
+
+	/**
+	 * 根据该父类的id获取该父类的类型，插入到该对像的父类parentId中
+	 * @param parentId
+	 * @return
+	 */
+	String getParentTypeId(@Param("parentId")String parentId);
+
+	/**
+	 *更改状态（根据id修改状态）
+	 * @param projectType
+	 */
+    void changeStatus(ProjectType projectType);
 }

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

@@ -26,6 +26,7 @@ public class ProjectType extends DataEntity<ProjectType> {
 
     private String createId;//创建者id
     private String view;
+    private String forbidden;//禁用类型删除标记（0：正常；1：删除；）
 
     @JsonIgnore
     public static String getRootId(){
@@ -115,4 +116,12 @@ public class ProjectType extends DataEntity<ProjectType> {
     public void setChooseCondition(String chooseCondition) {
         this.chooseCondition = chooseCondition;
     }
+
+    public String getForbidden() {
+        return forbidden;
+    }
+
+    public void setForbidden(String forbidden) {
+        this.forbidden = forbidden;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.jeeplus.modules.projectType.dao.ProjectTypeDao;
 import com.jeeplus.modules.projectType.entity.ProjectType;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectBasedData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportTreeData;
+import com.jeeplus.modules.workcontent.entity.WorkContentType;
 import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,6 +56,7 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
     @Transactional(readOnly = false)
     public void save(ProjectType projectType) {
         if(StringUtils.isBlank(projectType.getParentId())){
+            //获取该父类id为0的（parent_id=0）的该类型的(type_id)的类型id
             String newIdStr = dao.getNewParentId();
             Integer newIdInt = null;
             if(StringUtils.isNotBlank(newIdStr)){
@@ -75,6 +77,10 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
                 projectType.preInsert();
                 //查询已知该父节点下的数据的最大值的typeId并递增1
                 String typeId = dao.getNewTypeId(projectType.getParentId());
+               /* //根据该父类的id获取该父类的类型，插入到该对像的父类parentId中
+                String parentTypeId=dao.getParentTypeId(projectType.getParentId());
+                projectType.setParentId(parentTypeId);*/
+
                 projectType.setTypeId(typeId);
                 dao.insert(projectType);
             }
@@ -112,4 +118,20 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
     public ProjectBasedData getBasedData(String contentId,String basedId){
         return dao.getBasedData(contentId,basedId);
     }
+
+    //更改状态
+    @Transactional(readOnly = false)
+    public String changeStatus(ProjectType projectType) {
+        String msg = null;
+        //如果状态发送是1
+        if("1".equals(projectType.getForbidden())){
+            projectType.setForbidden(projectType.DEL_FLAG_NORMAL);
+            msg = "启用";
+        }else {
+            projectType.setForbidden(projectType.DEL_FLAG_DELETE);
+            msg = "禁用";
+        }
+        dao.changeStatus(projectType);
+        return msg;
+    }
 }

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

@@ -177,4 +177,16 @@ public class ProjectTypeController extends BaseController {
 		}
 		return map;
 	}
+
+	/**
+	 * 启用、禁用项目类型
+	 */
+	@RequestMapping(value = "change")
+	public String changeStatus(ProjectType projectType, RedirectAttributes redirectAttributes) {
+		//Office company = UserUtils.getSelectCompany();
+		//projectType.setCompany(company);
+		String msg = projectTypeService.changeStatus(projectType);
+		addMessage(redirectAttributes, msg+"项目类型成功");
+		return "redirect:"+Global.getAdminPath()+"/projectType/projectType/?repage";
+	}
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportTreeData.java

@@ -26,6 +26,7 @@ public class ProjectReportTreeData {
     private String loginUserId;
 
     private String createBy;
+    private String forbidden;//项目类型禁用状态
 
     public String getId() {
         return id;
@@ -139,4 +140,12 @@ public class ProjectReportTreeData {
     public void setTier(String tier) {
         this.tier = tier;
     }
+
+    public String getForbidden() {
+        return forbidden;
+    }
+
+    public void setForbidden(String forbidden) {
+        this.forbidden = forbidden;
+    }
 }

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -245,7 +245,9 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 	public void saveProject(ProjectRecords projectRecords,ProjectStatusEnum projectStatus) throws Exception {
 		long t1 = System.currentTimeMillis();
 
+		//合同对象
 		WorkContractInfo workContractInfo = null;
+		//客户对象
 		WorkClientInfo workClientInfo = new WorkClientInfo();
 		Office company= new Office();
 		Office office =  new Office();

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

@@ -15,7 +15,8 @@
 		a.update_date,
 		a.del_flag,
 		a.tier,
-		a.choose_condition as "chooseCondition"
+		a.choose_condition as "chooseCondition",
+		a.forbidden as "forbidden"
 	</sql>
 
 
@@ -53,7 +54,7 @@
 	<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",a.tier,a.choose_condition as chooseCondition
+		 a.type_name as "name",a.parent_id as "pid",a.tier,a.choose_condition as chooseCondition,a.forbidden as forbidden
 		from project_type a
 		<where>
 			a.del_flag = 0
@@ -197,4 +198,12 @@
 
 	</select>
 
+	<select id="getParentTypeId" resultType="java.lang.String">
+		select type_id as typeId from project_type where parent_id = #{parentId}
+	</select>
+
+	<update id="changeStatus">
+		update project_type set forbidden=#{forbidden} where id=#{id};
+	</update>
+
 </mapper>

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

@@ -64,6 +64,7 @@
 						<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>
+					<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>
 
@@ -158,7 +159,16 @@
 							}
 						}},
 					{field: 'createDate', title: '创建时间',width:80},
-					{templet: complain, title: '操作'}
+					{field: 'forbidden', title: '状态',width:60,templet:function(d){
+							if('0'== d.forbidden){
+								return '<a>启用</a>';
+
+							}else if('1'== d.forbidden){
+								return '<a> 禁用</a>';
+
+							}
+						}},
+					{templet: complain, title: '操作',width:390}
 				]],
 				done: function () {
 					layer.closeAll('loading');
@@ -183,12 +193,33 @@
 
 
 		function complain(d){//操作中显示的内容
-			return [
+			/*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('');
+			].join('');*/
+			if('0'==d.forbidden){
+				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>',
+					'<a href="${ctx}/projectType/projectType/change?id='+d.id+'&forbidden='+d.forbidden+'" onclick="return confirmx(\'确认要禁用该项目类型吗？\', this.href)"   class="op-btn op-btn-delete"><i class="layui-icon-close-fill"></i> 禁用</a>',
+				].join('');
+			}else if('1'==d.forbidden){
+				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>',
+					'<a href="${ctx}/projectType/projectType/change?id='+d.id+'&forbidden='+d.forbidden+'" onclick="return confirmx(\'确认要启用该项目类型吗？\', this.href)"   class="op-btn op-btn-submit"><i class="fa fa-undo"></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>