Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -221,14 +221,14 @@ public  class ProExcelInfo {
             if (null==project.getRunUnitInspectionRole()){
                 str+="运行单位运检不能为空";
             }
-            if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
+/*            if (null==project.getThroughResearchRole()||"".equals(project.getThroughResearchRole())){//经研所角色
                 str+="经研所角色不能为空;";
             }else {
                 judgeLoginName = getJudgeLoginName(users, project.getThroughResearchRole());
                 if (judgeLoginName){
                     str+="经研所角色不存在;";
                 }
-            }
+            }*/
             if (null==project.getConstructionUnit()||"".equals(project.getConstructionUnit())){//施工单位
                 str+="施工单位不能为空;";
             }
@@ -269,12 +269,12 @@ public  class ProExcelInfo {
             }
             if (null==project.getDesignUnitLeader()||"".equals(project.getDesignUnitLeader())){//设计单位
                 str+="设计单位领导不能为空;";
-            }else {
+            }/*else {
                 judgeLoginName = getJudgeLoginName(users, project.getDesignUnitLeader());
                 if (judgeLoginName){
                     str+="设计单位领导不存在;";
                 }
-            }
+            }*/
             if (null!=project.getType()){//类型
                 flag = getJudge(project.getType(), PRO_TYPE);
                 if (flag){
@@ -305,7 +305,7 @@ public  class ProExcelInfo {
             }
             if (null==project.getPowerScope()||"".equals(project.getPowerScope())){//停电范围
                 str+="停电范围不能为空;";
-            }else {
+            }/*else {
                 String[] split = project.getPowerScope().split(";");
                 for (int i = 0; i <split.length; i++) {
                     flag = getJudge(split[i], PRO_POWERSCOPE);
@@ -313,7 +313,7 @@ public  class ProExcelInfo {
                         str+="停单范围填写有误;";
                     }
                 }
-            }
+            }*/
             if (null==project.getProjectType()||"".equals(project.getProjectType())){//项目类型
                 str+="项目类型填写不能为空;";
             }else {

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -192,7 +192,7 @@ public class ProjectController extends BaseController {
 	@RequiresPermissions(value={"sg:managementcenter:project:view","sg:managementcenter:project:add","sg:managementcenter:project:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Project project, Model model) {
-		String powerScope = project.getPowerScope();
+		/*String powerScope = project.getPowerScope();
 		if (null != powerScope) {
 			List<String> newList = new ArrayList<>();
 			String[] split = powerScope.split(";");
@@ -200,7 +200,7 @@ public class ProjectController extends BaseController {
 				newList.add(split[i]);
 			}
 			project.setPowerScopeList(newList);
-		}
+		}*/
 		model.addAttribute("project", project);
 		if (null != project.getId()){
 			if (!project.getStatus().equals("0")||!project.getAcquisitionStatus().equals("0")
@@ -236,12 +236,12 @@ public class ProjectController extends BaseController {
 		}
 		List<String> users = projectService.findAllUser();
 		List<Project> arrayLists = new ArrayList<Project>();
-		List<String> powerScopeList = project.getPowerScopeList();
+		/*List<String> powerScopeList = project.getPowerScopeList();
 		String b = "";
 		for (String a : powerScopeList) {
 			b += a + ";";
 		}
-		project.setPowerScope(b);
+		project.setPowerScope(b);*/
 		arrayLists.add(project);
 		String judgeValue = ProExcelInfo.getJudgeValue(arrayLists,users);
 		if (!"".equals(judgeValue)){

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -372,7 +372,7 @@ public class PickIngController extends BaseController {
     }
 
     /**
-     * 领料流程发起
+     * 提前施工流程发起
      */
     @ResponseBody
     @RequestMapping(value = "save")
@@ -463,8 +463,8 @@ public class PickIngController extends BaseController {
         String s = constructionService.nameFindOffice(loginName);
         if ("配网政策处理专职".equals(s)) {
             vars.put("full", true);
-            Project user = MyActiviUtils.findUser(pickApplication.getAct().getProcInsId());
-            vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+            Project project = projectService.get(pickApplication.getProjectId());
+            vars.put("manager", UserUtils.getByUserName(project.getProjectManageRole()).getLoginName());
             j.setMsg("发起流程审批成功!");
         } else {
             showListService.projectUpdate(pickApplication);

src/main/webapp/webpage/modules/sg/advence/activiti/constructionAdvanceForm.jsp

@@ -37,7 +37,7 @@
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>项目名称：</label></td>
 								<td class="width-35">
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataAdvance" id="project" name="projectId" value="${construction.projectName}" labelName="project.requireName" labelValue="${construction.projectName}"
-													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="true"></sys:itemselect>
+													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projectId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}|${fns:urlEncode('工程编号')}|${fns:urlEncode('项目名称')}|${fns:urlEncode('项目定义号')}" searchKeys="requireName|projectId|projectName|projectNumber"  isMultiSelected="false"></sys:itemselect>
 								</td>
 							</tr>
 							<tr>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm.jsp

@@ -273,8 +273,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
-<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
-						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
+						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
+<%--						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
 <%--						<form:select  path="powerScope" cssClass="form-control">
 							<form:option value="670"/>
 							<form:option value="67001+"/>

src/main/webapp/webpage/modules/sg/managementcenter/project/projectForm1.jsp

@@ -249,8 +249,8 @@
 					</td>
 					<td class="width-15 active"><label class=""><font color="red">*</font>停电范围：</label></td>
 					<td class="width-35">
-						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>
-<%--						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>--%>
+<%--						<form:checkboxes path="powerScopeList" items="${fns:getDictList('Range')}" itemLabel="label" itemValue="value" htmlEscape="false" cssClass="i-checks required"/>--%>
+						<form:input path="powerScope" htmlEscape="false"    class="form-control"/>
 					</td>
 				</tr>
 				<tr>

src/main/webapp/webpage/modules/sg/picking/activiti/netExamineTemUpload.jsp

@@ -49,7 +49,7 @@
 		<table class="table table-bordered">
 			<tbody>
 			<tr>
-				<td class="width-15 active"><label class="pull-right" style="float: left">项目信息：</label></td>
+				<td class="width-15 active"><label class="pull-right" style="float: left">物料信息：</label></td>
 				<td class="width-35">
 					<sys:itemselect url="${ctx}/sg/managementcenter/marterialProvided/searchData" id="project" name="projectId" value="${materialProvided.id}" labelName="materialProvided.materialDescription" labelValue="${materialProvided.materialDescription}"
 									title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('物料编码|物料描述|扩展编码|扩展编码描述|计量单位|参考概算价格|版本号')}" fieldKeys="materialCode|materialDescription|extendedCode|extendedDescription|measuringUnit|referencePrice|version" searchLabels="${fns:urlEncode('物料编码')}" searchKeys="materialCode"  isMultiSelected="false"></sys:itemselect>

src/main/webapp/webpage/modules/sg/picking/activiti/netExamineUpload.jsp

@@ -46,7 +46,7 @@
 		<table class="table table-bordered">
 			<tbody>
 			<tr>
-				<td class="width-15 active"><label class="pull-right" style="float: left">项目信息：</label></td>
+				<td class="width-15 active"><label class="pull-right" style="float: left">物料信息：</label></td>
 				<td class="width-35">
 					<sys:itemselect url="${ctx}/sg/managementcenter/marterialProvided/searchData" id="project" name="projectId" value="${materialProvided.id}" labelName="materialProvided.materialDescription" labelValue="${materialProvided.materialDescription}"
 									title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('物料编码|物料描述|扩展编码|扩展编码描述|计量单位|参考概算价格|版本号')}" fieldKeys="materialCode|materialDescription|extendedCode|extendedDescription|measuringUnit|referencePrice|version" searchLabels="${fns:urlEncode('物料编码')}" searchKeys="materialCode"  isMultiSelected="false"></sys:itemselect>