Merge remote-tracking branch 'origin/master'

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

@@ -72,6 +72,9 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
                 dao.update(projectType);
             }else{
                 projectType.preInsert();
+                //查询已知该父节点下的数据的最大值的typeId并递增1
+                String typeId = dao.getNewTypeId(projectType.getParentId());
+                projectType.setTypeId(typeId);
                 dao.insert(projectType);
             }
 

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -1385,6 +1385,8 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			type = "achievement_type";
 		}else if (2 == judgeType){
 			type = "supporting_document_data_type";
+		}else if (3 == judgeType){
+			type = "project_type";
 		}
 		List<MainDictDetail> dictList=new ArrayList<>();
 		String comId=UserUtils.getSelectCompany().getId();

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementCompletionController.java

@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
- * 项目实施阶段Controller
+ * 项目竣工阶段Controller
  * @author 徐滕
  * @version 2020-07-10
  */

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

@@ -85,7 +85,7 @@
 	</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 max(cast(type_id as unsigned integer))+1 as typeId from project_type where parent_id = #{parentId}
 	</select>
 
 	<update id="updateTypeId">

src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -296,9 +296,8 @@
 		ppt.type_name as clientName
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by
-		left join project_type pt on a.type = pt.id
+		left join project_type pt on a.type = pt.type_id
 		left join project_type ppt on pt.parent_id = ppt.id
-		left join project_type ptd on a.type = ptd.type_id
-		where a.project_id = #{projectId} and ptd.parent_id =#{projectTypeParentId} and a.del_flag = 0 order by a.update_date desc
+		where a.project_id = #{projectId} and pt.parent_id =#{projectTypeParentId} and a.del_flag = 0 order by a.update_date desc
 	</select>
 </mapper>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentForm.jsp

@@ -873,7 +873,7 @@
             url:'${ctx}/projectcontentinfo/projectcontentinfo/getAchievementTypeList2',
             data:{
                 "achievementParentId":obj,
-                "type":2
+                "type":3
             },
             success:function(data){
                 if(data.success) {

src/main/webapp/webpage/modules/sys/mainDictDetailForm.jsp

@@ -18,7 +18,7 @@
                 return false;
             }
 
-			if("achievement_type" == $("#typeName").val() || "supporting_document_data_type" == $("#typeName").val()){
+			if("achievement_type" == $("#typeName").val() || "supporting_document_data_type" == $("#typeName").val() || "project_type" ==$("#typeName").val() ){
                 var achievementParentId=$("#achievementParentId").val();
                 if(achievementParentId==null||achievementParentId==""){
                     top.layer.msg('工作内容类型不能为空！', {icon: 0});
@@ -68,7 +68,7 @@
         var validateForm;
 		$(document).ready(function() {
             var achievementParentIdDiv = $("#typeName").val();
-            if("achievement_type" == achievementParentIdDiv || "supporting_document_data_type" == achievementParentIdDiv){
+            if("achievement_type" == achievementParentIdDiv || "supporting_document_data_type" == achievementParentIdDiv || "project_type" ==achievementParentIdDiv){
                 $("#achievementParentIdDiv").show();
             }else{
                 $("#achievementParentIdDiv").hide();
@@ -111,7 +111,7 @@
 
             $("#typeName").blur(function(){
                 var typeName = $(this).val();
-				if("achievement_type" == typeName || "supporting_document_data_type" == typeName){
+				if("achievement_type" == typeName || "supporting_document_data_type" == typeName || "project_type" == typeName){
                     $("#achievementParentIdDiv").show();
                 }else{
                     $("#achievementParentIdDiv").hide();
@@ -188,20 +188,49 @@
 				<div class="layui-item layui-col-sm6" id="achievementParentIdDiv" style="display: none;">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>工作内容类型节点：</label>
 					<div class="layui-input-block">
-						<form:select id="achievementParentId" path="achievementParentId"  htmlEscape="false"   onchange="changeContentDetail(this)"  class="form-control simple-select required">
-							<form:option value=""></form:option>
+						<%--<form:select id="achievementParentId" path="achievementParentId"  htmlEscape="false"   onchange="changeContentDetail(this)"  class="form-control simple-select required">
+							<form:option value=""></form:option>--%>
 							<%--<optgroup label="决策阶段"/>
 							<form:options items="${fns:getContentTypeList('1')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
-							<optgroup label="项目实施前期"/>
-							<form:options items="${fns:getContentTypeList('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
+							<%--<optgroup label="项目实施前期"/>
+							<form:options items="${fns:getContentTypeList('2')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
 							<%--<optgroup label="发承包阶段"/>
 							<form:options items="${fns:getContentTypeList('3')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
-							<optgroup label="项目实施阶段"/>
+							<%--<optgroup label="项目实施阶段"/>
 							<form:options items="${fns:getContentTypeList('4')}" itemLabel="typeName" itemValue="typeId"></form:options>
 							<optgroup label="项目竣工阶段"/>
-							<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
+							<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
 							<%--<optgroup label="运营阶段"/>
 							<form:options items="${fns:getContentTypeList('6')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+						<%--</form:select>--%>
+
+						<form:select id="achievementParentId" path="achievementParentId"  htmlEscape="false"   onchange="changeContentDetail(this)"  class="form-control simple-select required">
+							<form:option value=""></form:option>
+							<c:choose>
+							<c:when test="${mainDict.typeName == 'project_type'}">
+								<optgroup label="项目实施前期"/>
+								<form:options items="${fns:getContentTypeByProjectType('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
+								<optgroup label="项目实施阶段"/>
+								<form:options items="${fns:getContentTypeByProjectType('3')}" itemLabel="typeName" itemValue="typeId"></form:options>
+								<optgroup label="项目竣工阶段"/>
+								<form:options items="${fns:getContentTypeByProjectType('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
+							</c:when>
+							<c:otherwise>
+									<form:option value=""></form:option>
+										<%--<optgroup label="决策阶段"/>
+										<form:options items="${fns:getContentTypeList('1')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<optgroup label="项目实施前期"/>
+									<form:options items="${fns:getContentTypeList('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
+										<%--<optgroup label="发承包阶段"/>
+										<form:options items="${fns:getContentTypeList('3')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<optgroup label="项目实施阶段"/>
+									<form:options items="${fns:getContentTypeList('4')}" itemLabel="typeName" itemValue="typeId"></form:options>
+									<optgroup label="项目竣工阶段"/>
+									<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
+										<%--<optgroup label="运营阶段"/>
+										<form:options items="${fns:getContentTypeList('6')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+							</c:otherwise>
+						</c:choose>
 						</form:select>
 					</div>
 				</div>