Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectContentTreeData.java

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

@@ -53,6 +53,10 @@ public interface ProjectTypeDao extends CrudDao<ProjectType> {
 	 * 初始化加载获取项目类型到下拉框
 	 */
 	List<ProjectType> getProjectType();
+	/**
+	 * 根据typeId获取数据
+	 */
+	ProjectType getDataByTypeId(String typeId);
 
 	/**
 	 * 根据项目所属区域类型获取对应得二级级别信息

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

@@ -99,6 +99,12 @@ public class ProjectTypeService extends CrudService<ProjectTypeDao, ProjectType>
     public List<ProjectType> getProjectType() {
         return projectTypeDao.getProjectType();
     }
+    /**
+     * 根据typeId获取数据
+     */
+    public ProjectType getDataByTypeId(String typeId) {
+        return projectTypeDao.getDataByTypeId(typeId);
+    }
 
     public List<ProjectBasedData> getAccrdingDataList(String typeId){
         return dao.getAccrdingDataList(typeId);

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

@@ -26,6 +26,7 @@ public class ProjectContentTreeData {
 
     private String contentName;//工作内容
     private String stageName;//阶段名称
+    private String reportType;
 
     public String getId() {
         return id;
@@ -147,4 +148,12 @@ public class ProjectContentTreeData {
     public void setStageName(String stageName) {
         this.stageName = stageName;
     }
+
+    public String getReportType() {
+        return reportType;
+    }
+
+    public void setReportType(String reportType) {
+        this.reportType = reportType;
+    }
 }

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -11,7 +11,9 @@ import com.jeeplus.common.utils.*;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectType.entity.ProjectType;
 import com.jeeplus.modules.projectType.service.ProjectResultsFileTemplateService;
+import com.jeeplus.modules.projectType.service.ProjectTypeService;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectContentTreeData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
@@ -58,6 +60,8 @@ public class ProjectReportNumController extends BaseController {
     private ProjectRecordsService projectRecordsService;
 	@Autowired
     private ProjectResultsFileTemplateService projectResultsFileTemplateService;
+	@Autowired
+	private ProjectTypeService projectTypeService;
 
 
 	@RequestMapping(value = "skipMethod")
@@ -274,6 +278,10 @@ public class ProjectReportNumController extends BaseController {
 	 */
 	@RequestMapping(value = "skipTemplateForm")
 	public String skipTemplateForm(ProjectContentTreeData treeData,Model model, HttpServletRequest request) {
+		if(StringUtils.isNotBlank(treeData.getReportType())){
+			ProjectType dataByTypeId = projectTypeService.getDataByTypeId(treeData.getReportType());
+			model.addAttribute("typeName",dataByTypeId.getTypeName());
+		}
 		List<ProjectContentTreeData> projectContentTreeDataList = projectResultsFileTemplateService.getTemplateForm(treeData.getType());
 		model.addAttribute("contentName",projectContentTreeDataList.get(0).getContentName());
 		model.addAttribute("num",treeData.getNum());
@@ -329,7 +337,7 @@ public class ProjectReportNumController extends BaseController {
 
 
 
-	
+
 
 
 	

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

@@ -166,6 +166,10 @@
 		select type_id as "typeId",type_name as "typeName" from project_type where parent_id="0"
 	</select>
 
+	<select id="getDataByTypeId" resultType="com.jeeplus.modules.projectType.entity.ProjectType">
+		select type_id as "typeId",type_name as "typeName" from project_type where type_id = #{typeId}
+	</select>
+
 	<select id="getProjectTypeByParentId" resultType="java.lang.String">
 		select type_id typeId from project_type
 		where parent_id = #{parentId}

src/main/webapp/webpage/modules/projectreportnum/projectReportNumList.jsp

@@ -136,7 +136,7 @@
 				}else
 				if(d.count >1){
 					return[
-						"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('选择报告模板','${ctx}/projectreportnum/projectReportNum/skipTemplateForm?num="+d.num+"&type="+d.type+"','80%', '80%');\" class=\"op-btn op-btn-edit layui-bg-orange\"><i class=\"fa fa-edit\"></i> 生成报告模板</a>"
+						"<a href=\"javascript:void(0)\" onclick=\"downloadFile('选择报告模板','${ctx}/projectreportnum/projectReportNum/skipTemplateForm?reportType=${reportType}&num="+d.num+"&type="+d.type+"','80%', '80%');\" class=\"op-btn op-btn-edit layui-bg-orange\"><i class=\"fa fa-edit\"></i> 生成报告模板</a>"
 						/*"<a href=\"${ctx}/projectreportnum/projectReportNum/download?number=" +encodeURIComponent(encodeURIComponent( d.num ))+ "\"    class=\"op-btn op-btn-edit layui-bg-orange\"><i class=\"fa fa-edit\"></i> 生成报告模板</a>"*/
 					].join('');
 				}
@@ -197,6 +197,47 @@
 		});
 
 	}
+
+	function downloadFile(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中展示
+				if(iframeWin.contentWindow.doSubmit(1) ){
+					// top.layer.close(index);//关闭对话框。
+					setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+				}
+			},
+			cancel: function(index){
+			}
+		});
+
+	}
+
 	function formSubmit($document,inputForm,index){
 		$($document.getElementById(inputForm)).ajaxSubmit({
 			success:function(data) {

src/main/webapp/webpage/modules/projectreportnum/projectTemplateFileForm.jsp

@@ -7,12 +7,12 @@
 	<script type="text/javascript">
 
 		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
-		   var stageId=$("#stageId").val();
-		   if(stageId==null||stageId==""){
-               top.layer.msg('阶段信息不能为空！', {icon: 0});
+		   var url=$("#file").val();
+		   if(url==null||url==""){
+               top.layer.msg('请选择报告模板！', {icon: 0});
                return false;
 		   }
-			//$("#inputForm").submit();
+		   $("#inputForm").submit();
 		  return true;
 		}
         var validateForm;
@@ -35,31 +35,13 @@
 					}
 				}
 			});
-
-            $("#typeName").blur(function(){
-                var typeName = $(this).val();
-				if("achievement_type" == typeName || "supporting_document_data_type" == typeName){
-                    $("#achievementParentIdDiv").show();
-                }else{
-                    $("#achievementParentIdDiv").hide();
-                }
-            })
-
-            $("#typeName").blur(function(){
-                var reviewStandard = $(this).val();
-                if("reviewStandard" == reviewStandard){
-                    $("#reviewStandardParentIdDiv").show();
-                }else{
-                    $("#reviewStandardParentIdDiv").hide();
-                }
-            })
 		});
 	</script>
 </head>
 <body>
 <div class="single-form">
 	<div class="container view-form">
-		<form:form id="inputForm" modelAttribute="projectContentTreeData" action="${ctx}/projectreportnum/projectReportNum/saveReportNumOnStage" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectContentTreeData" action="${ctx}/workfullmanage/workFullManage/downLoadAttach" method="post" class="form-horizontal">
 			<input type="hidden" id="parentId" name="parentId" value="${reportNum.parentId}">
 			<input type="hidden" id="projectId" name="projectId" value="${reportNum.projectId}">
 		<sys:message content="${message}"/>
@@ -72,9 +54,9 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6"  style="width:50%">
-					<label class="layui-form-label">阶段：</label>
+					<label class="layui-form-label">阶段名称：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" name="num" readonly="true" class="form-control layui-input" value="${num}"/>
+						<input htmlEscape="false" name="typeName" readonly="true" class="form-control layui-input" value="${typeName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6"  style="width:50%">
@@ -88,7 +70,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>模板信息：</label>
 					<div class="layui-input-block">
-						<select name="url" class="form-control editable-select layui-input">
+						<select id="file" name="file" class="form-control editable-select layui-input">
 							<option value=""></option>
 							<c:forEach items="${projectContentTreeData}" var="content">
 								<option value="${content.url}">