Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1367,11 +1367,11 @@ public class ActTaskService extends BaseService {
         }else {
 			if (flagItemCLose){
 				vars.put("itemClose","专职");
-				vars.put("pass2",flagItemCLose);
+				vars.put("pass2",true);
 			}else {
 				if (flagDesign){
 					vars.put("design","运行人员");
-					vars.put("pass1", flagDesign);
+					vars.put("pass1", true);
 				}
 				if ("民事农村".equals(flagDeal)){
 					vars.put("policy","政策处理");
@@ -2031,7 +2031,7 @@ public class ActTaskService extends BaseService {
 		ValueExpression e = factory.createValueExpression(context, el, boolean.class);
 		return (Boolean) e.getValue(context);
 	}
-
+	//项目关闭
 	public Boolean isJudgeItemClose(Disclose disclose){
 		Boolean flag = false;
 		if (null!=disclose.getChannel()&&disclose.getChannel().equals("无")){//施工通道
@@ -2058,6 +2058,7 @@ public class ActTaskService extends BaseService {
 //		}
 		return flag;
 	}
+	//设计变更
 	public Boolean isJudgeDesign(Disclose disclose){
 		Boolean flag = false;
 		if (null!=disclose.getLineName()&&disclose.getLineName().equals("否")){

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -746,8 +746,8 @@ public class ActTaskController extends BaseController {
 			j.setMsg("请导入数据");
 			return j;
 		}
-		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);
-		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);
+		Boolean flagDesign = actTaskService.isJudgeDesign(disclose);//设计变更
+		Boolean flagItemCLose =actTaskService.isJudgeItemClose(disclose);//项目关闭
 		String flagDeal =actTaskService.newJudgeDeal(disclose);
 		if (null==disclose.getPrecondition()||"".equals(disclose.getPrecondition())){
 			if (flagItemCLose){
@@ -763,7 +763,7 @@ public class ActTaskController extends BaseController {
 				}
 			}
 			if ("空".equals(flagDeal)) {
-				s += "政策类型不能未空";
+				s += "政策类型不能为空";
 				flag = true;
 			}
 /*			if (flagDeal){

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -303,10 +303,13 @@ public class ConstructionController extends BaseController {
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/receiptForm";
     }
-
+    /*
+        项目经理
+     */
+    @RequestMapping(value = "phaseManagerForm")
     public String phaseManagerForm(Construction construction, Model model){
         model.addAttribute("construction",construction);
-        return "modules/sg/managementcenter/activiti/phaseManagerForm";
+        return "modules/sg/managementcenter/activiti/phaseManageForm";
     }
     /**
      * 上传缴费单

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -73,6 +73,9 @@
 			<if test="status != null and  status != ''">
 				AND a.status = #{status}
 			</if>
+			<if test="whetherCloseStatus != null and  whetherCloseStatus != ''">
+				AND a.whether_close_status = #{whetherCloseStatus}
+			</if>
 			<if test="id != null and  id != ''">
 				AND a.id = #{id}
 			</if>

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

@@ -84,6 +84,7 @@ public class ProjectController extends BaseController {
 	@RequestMapping(value = "dataSys")
 	public Map<String, Object> dataSys(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		project.setStatus("0");
+		project.setWhetherCloseStatus("0");
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
 		return getBootstrapData(page);
 	}

src/main/webapp/webpage/modules/sg/managementcenter/activiti/coveredForm.jsp

@@ -42,6 +42,7 @@
                 })
 			});
 			$("#no").click(function () {
+                var fullName = $("#loginName").val();
 				jp.prompt("驳回", function (message) {
 					jp.post("${ctx}/act/task/coveredTask",
 							{
@@ -50,7 +51,7 @@
 								"taskDefKey": "${construction.act.taskDefKey}",
 								"procInsId": "${construction.act.procInsId}",
 								"procDefId": "${construction.act.procDefId}",
-								"fullName":"政策处理2",
+								"fullName":"项目经理",
 								"flag": "no",
 								"comment": window.encodeURI(message)
 							},
@@ -95,18 +96,19 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
-								<td class="width-35">
-									<sys:userselect roleName="配网政策处理专职"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-													loginName="loginName" loginValue="政策处理2" cssClass="form-control required"/>
-								</td>
-							</tr>
-							<tr>
 								<td class="width-15 active"><label class="pull-right">上传未盖章施工方案：</label></td>
 								<td class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
+								<%--<td class="width-15 active"><label class="pull-right">选择用户：</label></td>--%>
+								<%--<td class="width-35">--%>
+									<%--<sys:userselect roleName="配网政策处理专职"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"--%>
+													<%--loginName="loginName" loginValue="政策处理2" cssClass="form-control required"/>--%>
+								<%--</td>--%>
 							</tr>
+							<%--<tr>--%>
+								<%----%>
+							<%--</tr>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
 								<td class="width-35">
@@ -276,10 +278,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -380,10 +382,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/departmentForm.jsp

@@ -250,10 +250,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/memberForm.jsp

@@ -18,7 +18,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-							"fullTime":systemfulltime,
+							"fullTime":"专职",
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -100,12 +100,12 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
-								<td class="width-35">
-									<sys:userselect roleName="配网工程专职;配网系统专职" id="tuser" name="tuser.id" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"
-													labelName="tuser.name" labelValue="${construction.tuser.name}"
-													cssClass="form-control required"/>
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right">选择用户：</label></td>--%>
+								<%--<td class="width-35">--%>
+									<%--<sys:userselect roleName="配网工程专职;配网系统专职" id="tuser" name="tuser.id" value="${construction.tuser.id}" loginName="loginName" loginValue="系统专职"--%>
+													<%--labelName="tuser.name" labelValue="${construction.tuser.name}"--%>
+													<%--cssClass="form-control required"/>--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
@@ -276,10 +276,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/phaseManageForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="ani"/>
 	<!-- SUMMERNOTE -->
 	<%@include file="/webpage/include/summernote.jsp" %>
-	<%@include file="sealForm.js"%>
+	<%--<%@include file="phaseManageForm.js"%>--%>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
@@ -18,7 +18,7 @@
 						"taskDefKey":"${construction.act.taskDefKey}",
 						"procInsId":"${construction.act.procInsId}",
 						"procDefId":"${construction.act.procDefId}",
-                        "fullName":"",
+                        "fullName":"施工单位",
 						"flag":"yes",
 						"comment":window.encodeURI(message)
 					},
@@ -64,9 +64,9 @@
 						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
 					</h3>
 				</div>
-				<div style="margin: 0px 25px 0px 25px">
-					<table id="testPicTable"   data-toolbar="#toolbar"></table>
-				</div>
+				<%--<div style="margin: 0px 25px 0px 25px">--%>
+					<%--<table id="testPicTable"   data-toolbar="#toolbar"></table>--%>
+				<%--</div>--%>
 				<div class="panel-body">
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 					<form:hidden path="id"/>
@@ -262,10 +262,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -366,10 +366,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -412,7 +412,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="重新发起" />
-									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/receiptForm.jsp

@@ -263,10 +263,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -367,10 +367,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -410,7 +410,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-									<%--<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="不在发起" />--%>
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/sealForm.jsp

@@ -268,10 +268,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -372,10 +372,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>
@@ -418,7 +418,7 @@
 							<div class="col-sm-6">
 								<div class="form-group text-center">
 									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />
-									<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />
+									<input id="no" class="btn  btn-danger btn-lg btn-parsley" type="submit" value="驳回" />
 								</div>
 							</div>
 						</div>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/speciallyForm.jsp

@@ -18,7 +18,7 @@
                             "taskDefKey": "${construction.act.taskDefKey}",
                             "procInsId": "${construction.act.procInsId}",
                             "procDefId": "${construction.act.procDefId}",
-                            "fullName":"配网运行",
+                            "fullName":"运行人员",
                             "flag": "yes",
                             "comment": window.encodeURI(message)
                         },
@@ -275,10 +275,10 @@
 								<td class="width-35">
 										${construction.disclose.administrationType}
 								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>
-								<td class="width-35">
-										${construction.disclose.politicalProblem}
-								</td>
+								<%--<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否存在严重政处问题（预判）：</label></td>--%>
+								<%--<td class="width-35">--%>
+										<%--${construction.disclose.politicalProblem}--%>
+								<%--</td>--%>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">前置条件：</label></td>