Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectcontentinfoDao.java

@@ -37,4 +37,6 @@ public interface ProjectcontentinfoDao extends CrudDao<Projectcontentinfo> {
 
     void deleteInfosByParent(String parentIds);
     void updateByLinkId(@Param("linkId")String linkId,@Param("dataName")String dataName);
+
+    List<Projectcontentinfo> findType(@Param("projectId")String projectId,@Param("type")String type);
 }

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

@@ -416,7 +416,12 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			}
 			if (!count.equals("8")) {
 				Projectcontentinfo select1 = new Projectcontentinfo();
-				select1.setParent(new Projectcontentinfo(parentId));
+				List<Projectcontentinfo> projectcontentinfos = dao.findType(projectcontentinfo.getProject().getId(),name);
+				if(projectcontentinfos.size()>0){
+					select1.setParent(projectcontentinfos.get(0));
+				}else {
+					select1.setParent(new Projectcontentinfo(parentId));
+				}
 				select1.setType(count);
 				select1.setDictType(dictType);
 				select1.setProject(projectcontentinfo.getProject());
@@ -429,15 +434,23 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 					}
 					sort += 10;
                     select1.setParent(parent);
+                    select1.setParentIds(parentIds);
 					select1.setSort(sort);
 					select1.setDictType(dictType);
 					select1.setCompanyId(contentinfo.getCompanyId());
 					select1.setOfficeId(contentinfo.getOfficeId());
 					select1.setName(StringUtils.isBlank(dictName) ? dictType : dictName);
-					this.save(select1);
-					parentIds += select1.getId() + ",";
-					parentId = select1.getId();
-					parent = select1;
+					List<Projectcontentinfo> projectcontentinfoList = dao.findType(projectcontentinfo.getProject().getId(),dictName);
+					if(projectcontentinfoList.size()==0) {
+						this.save(select1);
+						parentIds += select1.getId() + ",";
+						parentId = select1.getId();
+						parent = select1;
+					}else {
+						parent = projectcontentinfoList.get(0);
+						parentId = projectcontentinfoList.get(0).getId();
+						parentIds += parentId + ",";
+					}
 				} else {
 					Projectcontentinfo cinfo = cinfos.get(0);
 //						sort = cinfo.getSort() + 10;

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -738,7 +738,7 @@ public class ProjectcontentinfoController extends BaseController {
 
 	@RequestMapping(value = {"save"})
 	public String save(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model
-			,RedirectAttributes redirectAttributes) {
+			,RedirectAttributes redirectAttributes)  {
 		try{
 			String str = projectcontentinfoService.saveData(projectcontentinfo,1);
 			addMessage(redirectAttributes, "保存工作内容信息"+(str.equals("true")?"成功":"失败"));
@@ -788,8 +788,8 @@ public class ProjectcontentinfoController extends BaseController {
 	//
 	@RequestMapping(value = {"saveReport"})
 	public String saveReport(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response,
-							 Model model,RedirectAttributes redirectAttributes) throws Exception {
-//		try{
+							 Model model,RedirectAttributes redirectAttributes) {
+		try{
 			String str = projectcontentinfoService.saveData(projectcontentinfo,2);
 			addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));
 			ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
@@ -801,9 +801,9 @@ public class ProjectcontentinfoController extends BaseController {
 				}
 				return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectcontentinfo/?id="+projectcontentinfo.getId();
 			}
-//		}catch (Exception e){
-//			logger.error("ProjectcontentinfoController save Exception e"+e);
-//		}
+		}catch (Exception e){
+			logger.error("ProjectcontentinfoController save Exception e"+e);
+		}
 		if(UserUtils.isManager()){
 			model.addAttribute("flag","1");
 		}
@@ -1341,7 +1341,10 @@ public class ProjectcontentinfoController extends BaseController {
 		if ("2".equals(type)){          //审批中流程
 			ProjectReportData projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
 			model.addAttribute("processInstanceId", projectReportData.getProcessInstanceId());
-		}else if("8".equals(type)){         //变更中流程
+		}else if("3".equals(type)){     //变更中流程
+			ProjectReportData projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
+			model.addAttribute("processInstanceId", projectReportData.getProcessInstanceId());
+		} else if("8".equals(type)){         //变更中流程
 			ProjectReportData projectReportData = projectReportDataService.get(projectcontentinfo.getProjectReportData().getId());
 			model.addAttribute("processInstanceId", projectReportData.getUpId());
 		}else if("6".equals(type) || "7".equals(type)){      //作废流程

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

@@ -384,4 +384,12 @@
     <update id="deleteInfosByParent">
         DELETE FROM project_content_info WHERE parent_ids LIKE concat(#{parentIds},'%');
     </update>
+
+	<select id="findType" resultType="Projectcontentinfo">
+		SELECT id from project_content_info
+		<where>
+			project_id = #{projectId}
+			and name = #{type} and info_id is null
+		</where>
+	</select>
 </mapper>

src/main/webapp/webpage/modules/projectcontentinfo/reportChange.jsp

@@ -519,7 +519,7 @@
 					<!-- 表格 -->
 					<div style="float: left;">
 						<sys:gridselectContentData url="${ctx}/projectcontentinfo/projectContentData/selectcontentData" id="contentData" title="选择工作内容"
-												cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="工作内容名称" searchKey="name"></sys:gridselectContentData>
+												cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="${fns:urlEncode('工作内容名称')}" searchKey="name"></sys:gridselectContentData>
 					</div>
 					<table id="contentTable2" class="table table-bordered table-condensed details">
 						<thead>

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeList.jsp

@@ -277,7 +277,7 @@
                 ,{ title: '状态', align:'center',sort: true, width:70,templet:function(d){
                         var st = getAuditChangeState(d.status);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=3','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeModifyApply.jsp

@@ -517,7 +517,7 @@
 					<!-- 表格 -->
 					<div style="float: left;">
 						<sys:gridselectContentData url="${ctx}/projectcontentinfo/projectContentData/selectcontentData" id="contentData" title="选择工作内容"
-												cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="工作内容名称" searchKey="name"></sys:gridselectContentData>
+												cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="${fns:urlEncode('工作内容名称')}" searchKey="name"></sys:gridselectContentData>
 					</div>
 					<table id="contentTable2" class="table table-bordered table-condensed details">
 						<thead>

src/main/webapp/webpage/modules/projectcontentinfo/reportForm.jsp

@@ -522,7 +522,7 @@
 			<!-- 表格 -->
 			<div class="layui-item nav-btns">
 				<sys:gridselectContentData url="${ctx}/projectcontentinfo/projectContentData/selectcontentData" id="contentData" title="选择工作内容"
-										cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="工作内容名称" searchKey="name"></sys:gridselectContentData>
+										cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="${fns:urlEncode('工作内容名称')}" searchKey="name"></sys:gridselectContentData>
 			</div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="contentTable" class="table details table-bordered table-condensed">

src/main/webapp/webpage/modules/projectcontentinfo/reportInvalidList.jsp

@@ -275,7 +275,7 @@
                 ,{ title: '状态', align:'center',sort: true, width:70,templet:function(d){
                         var st = getAuditInvalidState(d.invalidStatus);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=3','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=6','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;

src/main/webapp/webpage/modules/projectcontentinfo/reportList.jsp

@@ -305,7 +305,7 @@
                 ,{ title: '状态', align:'center',sort: true, width:70,templet:function(d){
                         var st = getAuditState(d.status);
                         if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=1','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;

src/main/webapp/webpage/modules/projectcontentinfo/reportModifyApply.jsp

@@ -514,7 +514,7 @@
 					<!-- 表格 -->
 					<div style="float: left;">
 						<sys:gridselectContentData url="${ctx}/projectcontentinfo/projectContentData/selectcontentData" id="contentData" title="选择工作内容"
-												cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="工作内容名称" searchKey="name"></sys:gridselectContentData>
+												cssClass="form-control" projectId="${projectcontentinfo.project.id}" fieldLabels="" fieldKeys=""  searchLabel="${fns:urlEncode('工作内容名称')}" searchKey="name"></sys:gridselectContentData>
 					</div>
 					<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
 						<thead>

src/main/webapp/webpage/modules/serialnum/serialNumTplForm.jsp

@@ -99,20 +99,20 @@
 											cssStyle="required" title="公司" url="/sys/office/treeDataCompany?type=2" extId="${serialNumTpl.company.id}"  cssClass="form-control layui-input " allowClear="${serialNumTpl.currentUser.admin}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">公司简称：</label>
-					<div class="layui-input-block">
-						<input id="comSimpleName" htmlEscape="false" readonly="true" class="form-control layui-input " value="${fns:getSysParamByCompany("company_shortname", serialNumTpl.company.id)}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">分公司简称：</label>
-					<div class="layui-input-block">
-						<input id="branchSimpleName" htmlEscape="false" readonly="true"  class="form-control layui-input "
-								value="${fns:getSysParamByCompany("branch_shortname", serialNumTpl.company.id)}"
-						/>
-					</div>
-				</div>
+				<%--<div class="layui-item layui-col-sm6">--%>
+					<%--<label class="layui-form-label">公司简称：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input id="comSimpleName" htmlEscape="false" readonly="true" class="form-control layui-input " value="${fns:getSysParamByCompany("company_shortname", serialNumTpl.company.id)}"/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
+				<%--<div class="layui-item layui-col-sm6">--%>
+					<%--<label class="layui-form-label">分公司简称：</label>--%>
+					<%--<div class="layui-input-block">--%>
+						<%--<input id="branchSimpleName" htmlEscape="false" readonly="true"  class="form-control layui-input "--%>
+								<%--value="${fns:getSysParamByCompany("branch_shortname", serialNumTpl.company.id)}"--%>
+						<%--/>--%>
+					<%--</div>--%>
+				<%--</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>业务标识：</label>
 					<div class="layui-input-block">